Skip to content

Commit 9a48a5c

Browse files
committed
try fix CI fail on arm64 mac;
1 parent 71902be commit 9a48a5c

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

.github/workflows/ci.yml

+20-9
Original file line numberDiff line numberDiff line change
@@ -36,35 +36,46 @@ jobs:
3636
xcodebuild -workspace builds/xcode/ApkDiffPatch.xcworkspace -scheme ZipDiff -configuration Release OBJROOT=$PWD/bin SYMROOT=$PWD/bin
3737
xcodebuild -workspace builds/xcode/ApkDiffPatch.xcworkspace -scheme ZipPatch -configuration Release OBJROOT=$PWD/bin SYMROOT=$PWD/bin
3838
39-
ndk-build:
40-
strategy:
41-
matrix:
42-
platform: [macos-latest, windows-latest]
43-
runs-on: ${{ matrix.platform }}
39+
40+
macos-ndk-build:
41+
runs-on: macos-latest
42+
steps:
43+
- uses: actions/checkout@v2
44+
- uses: nttld/[email protected]
45+
with:
46+
ndk-version: r23c
47+
- name: buildByAndroidNDK
48+
run: |
49+
git submodule update --init --recursive
50+
cd ./builds/android_ndk_jni_mk
51+
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=./Application.mk APP_PLATFORM=android-16 APP_STL=c++_static
52+
53+
windows-ndk-build:
54+
runs-on: windows-latest
4455
steps:
4556
- uses: actions/checkout@v2
46-
- uses: nttld/setup-ndk@v1.0.6
57+
- uses: nttld/setup-ndk@v1.5.0
4758
with:
4859
ndk-version: r16b
4960
- name: buildByAndroidNDK
5061
run: |
5162
git submodule update --init --recursive
5263
cd ./builds/android_ndk_jni_mk
53-
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
64+
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=./Application.mk
5465
5566
ubuntu-ndk-build:
5667
runs-on: ubuntu-latest
5768
steps:
5869
- uses: actions/checkout@v2
59-
- uses: nttld/setup-ndk@v1.0.6
70+
- uses: nttld/setup-ndk@v1.5.0
6071
with:
6172
ndk-version: r16b
6273
- name: buildByAndroidNDK
6374
run: |
6475
sudo apt install libncurses5
6576
git submodule update --init --recursive
6677
cd ./builds/android_ndk_jni_mk
67-
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
78+
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=./Application.mk
6879
6980
7081
vc-build:

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ xcshareddata
1616
xcuserdata/
1717
builds/vc/Release/
1818
builds/vc/x64/
19+
builds/vc/ZipDiff/

0 commit comments

Comments
 (0)