Skip to content

Commit

Permalink
try fix CI fail on arm64 mac;
Browse files Browse the repository at this point in the history
  • Loading branch information
housisong committed Jul 7, 2024
1 parent 71902be commit 9a48a5c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 9 deletions.
29 changes: 20 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,35 +36,46 @@ jobs:
xcodebuild -workspace builds/xcode/ApkDiffPatch.xcworkspace -scheme ZipDiff -configuration Release OBJROOT=$PWD/bin SYMROOT=$PWD/bin
xcodebuild -workspace builds/xcode/ApkDiffPatch.xcworkspace -scheme ZipPatch -configuration Release OBJROOT=$PWD/bin SYMROOT=$PWD/bin
ndk-build:
strategy:
matrix:
platform: [macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
macos-ndk-build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: nttld/[email protected]
with:
ndk-version: r23c
- name: buildByAndroidNDK
run: |
git submodule update --init --recursive
cd ./builds/android_ndk_jni_mk
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=./Application.mk APP_PLATFORM=android-16 APP_STL=c++_static
windows-ndk-build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: nttld/setup-ndk@v1.0.6
- uses: nttld/setup-ndk@v1.5.0
with:
ndk-version: r16b
- name: buildByAndroidNDK
run: |
git submodule update --init --recursive
cd ./builds/android_ndk_jni_mk
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=./Application.mk
ubuntu-ndk-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: nttld/setup-ndk@v1.0.6
- uses: nttld/setup-ndk@v1.5.0
with:
ndk-version: r16b
- name: buildByAndroidNDK
run: |
sudo apt install libncurses5
git submodule update --init --recursive
cd ./builds/android_ndk_jni_mk
ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
ndk-build NDK_PROJECT_PATH=. NDK_APPLICATION_MK=./Application.mk
vc-build:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ xcshareddata
xcuserdata/
builds/vc/Release/
builds/vc/x64/
builds/vc/ZipDiff/

0 comments on commit 9a48a5c

Please sign in to comment.