fix ci: ubuntu -ndk-build

sisong · Sep 9, 2023 · c74d3b7 · c74d3b7
1 parent df48d51
commit c74d3b7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
   ndk-build:
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
@@ -60,6 +60,21 @@ jobs:
           cd ./builds/android_ndk_jni_mk
           ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk
 
+  ubuntu-ndk-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: nttld/[email protected]
+        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
+
+
   vc-build:
     runs-on: windows-latest
     steps:

diff --git a/Makefile b/Makefile
@@ -138,7 +138,6 @@ ifeq ($(MT),0)
     -D_IS_USED_MULTITHREAD=0
 else
   DEF_FLAGS += \
-    -DZSTD_MULTITHREAD=1 \
     -D_IS_USED_MULTITHREAD=1 \
     -D_IS_USED_PTHREAD=1
 endif

diff --git a/hdiffi_import_patch.h b/hdiffi_import_patch.h
@@ -13,7 +13,7 @@ extern "C" {
 #endif
 #define HPATCHLITE_VERSION_MAJOR    0
 #define HPATCHLITE_VERSION_MINOR    4
-#define HPATCHLITE_VERSION_RELEASE  2
+#define HPATCHLITE_VERSION_RELEASE  3
 
 #define _HPATCHLITE_VERSION          HPATCHLITE_VERSION_MAJOR.HPATCHLITE_VERSION_MINOR.HPATCHLITE_VERSION_RELEASE
 #define _HDIFFPATCH_QUOTE(str) #str