From 9a48a5c729d59198c9478839aad5f4736b7f5b8a Mon Sep 17 00:00:00 2001
From: sisong <housisong@hotmail.com>
Date: Sun, 7 Jul 2024 09:31:30 +0800
Subject: [PATCH] try fix CI fail on arm64 mac;

---
 .github/workflows/ci.yml | 29 ++++++++++++++++++++---------
 .gitignore               |  1 +
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fcfaea5..871d9b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,27 +36,38 @@ 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/setup-ndk@v1.5.0
+        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
@@ -64,7 +75,7 @@ jobs:
           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:
diff --git a/.gitignore b/.gitignore
index 78580e9..efc92eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ xcshareddata
 xcuserdata/
 builds/vc/Release/
 builds/vc/x64/
+builds/vc/ZipDiff/