CI: fix make & ndk;

sisong · Dec 26, 2024 · 0dbacd4 · 0dbacd4
1 parent 1d032af
commit 0dbacd4
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: ci
 on: [push, pull_request]
 jobs:
-  make-build:
+  gcc-build:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest]
@@ -10,11 +10,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: make_slef
         run: |
-          make BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+          make CC=gcc CXX=g++ BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
           make clean
       - name: make_0
         run: |
-          make DIR_DIFF=0 MT=0 VCD=0 ZLIB=0 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
+          make CC=gcc CXX=g++ DIR_DIFF=0 MT=0 VCD=0 ZLIB=0 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
           make clean
       - name: make_all
         run: |
@@ -24,11 +24,11 @@ jobs:
           git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
           git clone --depth=1 https://github.com/sisong/zlib.git ../zlib
           git clone --depth=1 https://github.com/sisong/libdeflate.git ../libdeflate
-          make BZIP2=1 -j
+          make CC=gcc CXX=g++ BZIP2=1 -j
           make BZIP2=1 clean
       - name: make_release_static
         run: |
-          make BZIP2=1 MINS=1 STATIC_C=1 -j
+          make CC=gcc CXX=g++ BZIP2=1 MINS=1 STATIC_C=1 -j
 
   clang-build:
     runs-on: ubuntu-latest
@@ -39,7 +39,7 @@ jobs:
           sudo apt-get install -y llvm clang
       - name: make_slefByClang
         run: |
-          make BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 CL=1 -j
+          make CL=1 BSD=0 BZIP2=0 LDEF=0 LZMA=0 ZSTD=0 MD5=0 -j
           make clean
       - name: make_allByClang
         run: |
@@ -49,7 +49,7 @@ jobs:
           git clone --depth=1 https://github.com/sisong/bzip2.git ../bzip2
           git clone --depth=1 https://github.com/sisong/zlib.git ../zlib
           git clone --depth=1 https://github.com/sisong/libdeflate.git ../libdeflate
-          make BZIP2=1 CL=1 -j
+          make CL=1 BZIP2=1 -j
 
   xcode-build:
     runs-on: macos-latest
@@ -106,6 +106,7 @@ jobs:
           ndk-version: r16b
       - name: buildByAndroidNDK
         run: |
+          echo "deb http://security.ubuntu.com/ubuntu focal-security main universe" > /etc/apt/sources.list.d/ubuntu-focal-sources.list
           sudo apt-get update
           sudo apt-get -y install libncurses5
           git clone --depth=1 https://github.com/sisong/lzma.git ../lzma