Skip to content

Commit 84068e4

Browse files
andycallandycall
committed
Merge branch 'fix/integration_test' into refactor/remove_host_class
2 parents 3cdd44a + 2605aa6 commit 84068e4

File tree

247 files changed

+1239
-6414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+1239
-6414
lines changed

‎.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* [Flutter](https://flutter.dev/docs/get-started/install) version in the `kraken/pubspec.yaml`
66
* [CMake](https://cmake.org/) v3.10.0 or later
77
* [Xcode](https://developer.apple.com/xcode/) (10.12) or later (Running on macOS or iOS)
8-
* [Android NDK](https://developer.android.com/studio/projects/install-ndk) version `21.4.7075529` (Running on Android)
8+
* [Android NDK](https://developer.android.com/studio/projects/install-ndk) version `23.2.8568313` (Running on Android)
99

1010
1. Install
1111

‎.github/workflows/benchmark.yml

-26
This file was deleted.

‎.github/workflows/bridge_compile_test.yml

-47
This file was deleted.

‎.github/workflows/contributors.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- name: Deploy
2121
uses: taixw2/deploy-aliyun-oss@main
2222
with:
23-
access-key-id: ${{ secrets.OSS_AK }}
24-
access-key-secret: ${{ secrets.OSS_SK }}
25-
bucket: kraken
26-
region: oss-cn-hangzhou
23+
access-key-id: ${{ secrets.ALIYUN_OSS_AK }}
24+
access-key-secret: ${{ secrets.ALIYUN_OSS_SK }}
25+
bucket: andycall
26+
region: oss-cn-beijing
2727
entry: CONTRIBUTORS.svg

‎.github/workflows/integration_test_flutter.yml

+38-4
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,54 @@ env:
1010
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1111
jobs:
1212
integration_test:
13-
runs-on: [self-hosted]
13+
runs-on: macos-latest
1414
steps:
1515
- uses: actions/checkout@v2
16+
- uses: actions/setup-node@v2
17+
with:
18+
node-version: ${{ env.nodeVersion }}
19+
- uses: jwlawson/[email protected]
20+
with:
21+
cmake-version: ${{ env.cmakeVersion }}
1622
- uses: subosito/flutter-action@v2
1723
with:
1824
flutter-version: ${{ env.flutterVersion }}
25+
- run: flutter config --enable-macos-desktop
26+
- run: flutter doctor -v
1927
- name: Run Test
2028
run: npm test
2129
id: test
2230
continue-on-error: true
23-
- name: Upload Snapshots
24-
run: node scripts/upload_snapshots.js
31+
- uses: actions/upload-artifact@v2
32+
with:
33+
name: integration_snapshots
34+
path: integration_tests/snapshots
35+
- name: Check on failures
36+
if: steps.test.outcome != 'success'
37+
run: exit 1
38+
plugin_test:
39+
runs-on: macos-latest
40+
steps:
41+
- uses: actions/checkout@v2
42+
- uses: actions/setup-node@v2
43+
with:
44+
node-version: ${{ env.nodeVersion }}
45+
- uses: jwlawson/[email protected]
46+
with:
47+
cmake-version: ${{ env.cmakeVersion }}
48+
- uses: subosito/flutter-action@v2
49+
with:
50+
flutter-version: ${{ env.flutterVersion }}
51+
- run: flutter config --enable-macos-desktop
52+
- run: flutter doctor -v
53+
- name: Run Plugin Test
54+
run: npm run pretest && npm run plugin_test
55+
id: test
2556
continue-on-error: true
57+
- uses: actions/upload-artifact@v2
58+
with:
59+
name: plugin_snapshots
60+
path: integration_tests/snapshots/plugins
2661
- name: Check on failures
2762
if: steps.test.outcome != 'success'
2863
run: exit 1
29-

‎.github/workflows/plugin_test_flutter.yml

-28
This file was deleted.

‎.github/workflows/publish_to_dart_dev.yml

+90-7
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,102 @@ jobs:
2929
with:
3030
name: linux_binary
3131
path: bridge/build/linux/
32-
33-
publishToPubDev:
34-
needs: build_linux_binary
35-
runs-on: [self-hosted, flutter_2.2.0]
32+
build_macos_binary:
33+
runs-on: macos-latest
34+
steps:
35+
- uses: actions/checkout@v2
36+
- uses: actions/setup-node@v2
37+
with:
38+
node-version: "16"
39+
- uses: jwlawson/[email protected]
40+
with:
41+
cmake-version: ${{ env.cmakeVersion }}
42+
- name: NPM INSTALL
43+
run: npm install
44+
- name: Build bridge binary
45+
run: npm run build:bridge:macos:release
46+
- uses: actions/upload-artifact@v2
47+
with:
48+
name: macos_binary
49+
path: bridge/build/macos/
50+
build_ios_binary:
51+
runs-on: macos-latest
52+
steps:
53+
- uses: actions/checkout@v2
54+
- uses: actions/setup-node@v2
55+
with:
56+
node-version: "16"
57+
- uses: jwlawson/[email protected]
58+
with:
59+
cmake-version: ${{ env.cmakeVersion }}
60+
- name: NPM INSTALL
61+
run: npm install
62+
- name: Build bridge binary
63+
run: npm run build:bridge:ios:release
64+
- uses: actions/upload-artifact@v2
65+
with:
66+
name: ios_binary
67+
path: bridge/build/ios/
68+
build_android_binary:
69+
runs-on: ubuntu-latest
3670
steps:
3771
- uses: actions/checkout@v2
72+
- uses: actions/setup-node@v2
73+
with:
74+
node-version: "16"
75+
- uses: nttld/setup-ndk@v1
76+
id: setup-ndk
77+
with:
78+
ndk-version: r23c
79+
env:
80+
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
81+
- uses: jwlawson/[email protected]
82+
with:
83+
cmake-version: ${{ env.cmakeVersion }}
3884
- name: NPM INSTALL
3985
run: npm install
4086
- name: Build bridge binary
41-
run: npm run build:bridge:all:release
87+
run: npm run build:bridge:android:release
88+
- uses: actions/upload-artifact@v2
89+
with:
90+
name: android_binary
91+
path: bridge/build/android/
92+
publish:
93+
needs: [build_linux_binary, build_android_binary, build_ios_binary, build_macos_binary]
94+
runs-on: ubuntu-latest
95+
steps:
96+
- uses: actions/checkout@v2
97+
- uses: subosito/flutter-action@v2
98+
with:
99+
flutter-version: ${{ env.flutterVersion }}
100+
- name: NPM INSTALL
101+
run: npm install
102+
- name: Set up nightly version
103+
run: node scripts/set_up_nightly_release.js
42104
- uses: actions/download-artifact@v2
43105
with:
44106
name: linux_binary
45107
path: bridge/build/linux/
46-
- name: Publish to dart.dev
47-
run: cd kraken && flutter pub publish --force
108+
- uses: actions/download-artifact@v2
109+
with:
110+
name: ios_binary
111+
path: bridge/build/ios/
112+
- uses: actions/download-artifact@v2
113+
with:
114+
name: macos_binary
115+
path: bridge/build/macos/
116+
- uses: actions/download-artifact@v2
117+
with:
118+
name: android_binary
119+
path: bridge/build/android/
120+
- name: Prepare distribute binaries
121+
run: node scripts/pre_publish_kraken.js
122+
- name: Publish
123+
uses: k-paxian/dart-package-publisher@master
124+
with:
125+
credentialJson: ${{ secrets.CREDENTIAL_JSON }}
126+
force: true
127+
flutter: true
128+
skipTests: true
129+
relativePath: ./kraken
130+

0 commit comments

Comments
 (0)