Build libzim with new archive for kiwix-build.

openzim · Apr 5, 2024 · accffea · accffea
1 parent d7a8cac
commit accffea
Showing 1 changed file with 27 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ jobs:
         os:
           - macos-13
         target:
-          - native_dyn
-          - iOS_arm64
-          - iOS_x86_64
+          - macos_x86_64-dyn
+          - ios-arm64-dyn
+          - ios-x86_64-dyn
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -105,41 +105,41 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - native_static
-          - native_dyn
-          - alpine_dyn
-          - aarch64_dyn
-          - android_arm
-          - android_arm64
-          - win32_static
-          - win32_dyn
+          - linux-x86_64-static
+          - linux-x86_64-dyn
+          - linux-aarch64-musl-dyn
+          - linux-aarch64-dyn
+          - android-arm
+          - android-arm64
+          - win32-static
+          - win32-dyn
           - wasm
         with_xapian:
           - true
           - false
         include:
-          - target: native_static
+          - target: linux-x86_64-static
             image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
-          - target: native_dyn
+          - target: linux-x86_64-dyn
             image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
-          - target: alpine_dyn
+          - target: linux-aarch64-musl-dyn
             image_variant: alpine
             lib_postfix: '/x86_64-linux-musl'
-          - target: aarch64_dyn
+          - target: linux-aarch64-dyn
             image_variant: focal
             lib_postfix: '/aarch64-linux-gnu'
-          - target: android_arm
+          - target: android-arm
             image_variant: focal
             lib_postfix: '/arm-linux-androideabi'
-          - target: android_arm64
+          - target: android-arm64
             image_variant: focal
             lib_postfix: '/aarch64-linux-android'
-          - target: win32_static
+          - target: win32-static
             image_variant: f35
             lib_postfix: '64'
-          - target: win32_dyn
+          - target: win32-dyn
             image_variant: f35
             lib_postfix: '64'
           - target: wasm
@@ -166,27 +166,30 @@ jobs:
         env:
           PKG_CONFIG_PATH: ${{env.HOME}}/BUILD_${{matrix.target}}/INSTALL/lib/pkgconfig:${{env.HOME}}/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig
         run: |
-          if [[ "${{matrix.target}}" =~ .*_dyn ]]
+          if [[ "${{matrix.target}}" =~ .*-dyn ]]
           then
             MESON_OPTION="--default-library=shared"
           else
             MESON_OPTION="--default-library=static"
           fi
-          if [[ "${{matrix.target}}" =~ native_.* ]]
-          then
-            MESON_OPTION="$MESON_OPTION -Db_coverage=true"
-          elif [[ "${{matrix.target}}" != alpine_* ]]
+          
+          if [ -e "${{ env.HOME }}/BUILD_${{ matrix.target }}/meson_cross_file.txt" ]
           then
             MESON_OPTION="$MESON_OPTION --cross-file ${{ env.HOME }}/BUILD_${{ matrix.target }}/meson_cross_file.txt"
+          else
+            MESON_OPTION="$MESON_OPTION -Db_coverage=true"
           fi
+          
           if [[ "${{matrix.target}}" =~ android_.* ]]
           then
             MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true -DUSE_BUFFER_HEADER=false"
           fi
+          
           if [[ "${{matrix.target}}" == wasm ]]
           then
             MESON_OPTION="$MESON_OPTION -Dexamples=false"
           fi
+
           meson setup . build ${MESON_OPTION} -Dwith_xapian=${{matrix.with_xapian}}
           cd build
           ninja