Merge pull request #313 from openzim/fix_ci_compilation

Update base image to build zim-tools in the CI.
openzim · Aug 4, 2022 · e7853d1 · e7853d1
2 parents 1e0e9fa + d6c3f6b
commit e7853d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,23 +42,23 @@ jobs:
           - win32_dyn
         include:
           - target: native_static
-            image_variant: xenial
+            image_variant: bionic
             lib_postfix: '/x86_64-linux-gnu'
           - target: native_dyn
-            image_variant: xenial
+            image_variant: bionic
             lib_postfix: '/x86_64-linux-gnu'
           - target: win32_static
-            image_variant: f31
+            image_variant: f35
             lib_postfix: '64'
           - target: win32_dyn
-            image_variant: f31
+            image_variant: f35
             lib_postfix: '64'
 
     env:
       HOME: /home/runner
     runs-on: ubuntu-latest
     container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-32"
     steps:
     - name: Extract branch name
       shell: bash
@@ -108,6 +108,8 @@ jobs:
        cd $HOME/zim-tools/build
        meson test --verbose
        ninja coverage
+      env:
+        LD_LIBRARY_PATH: "/home/runner/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}"
     - name: Publish coverage
       shell: bash
       run: |

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -9,7 +9,6 @@ jobs:
       matrix:
         distro:
           - ubuntu-jammy
-          - ubuntu-impish
           - ubuntu-focal
     steps:
       - uses: actions/checkout@v2
@@ -41,14 +40,6 @@ jobs:
           args: --no-sign
           ppa: ${{ steps.ppa.outputs.ppa }}
 
-      - uses: legoktm/gh-action-build-deb@ubuntu-impish
-        if: matrix.distro == 'ubuntu-impish'
-        name: Build package for ubuntu-impish
-        id: build-ubuntu-impish
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
       - uses: legoktm/gh-action-build-deb@ubuntu-focal
         if: matrix.distro == 'ubuntu-focal'
         name: Build package for ubuntu-focal