From d424a4e10d4e56366e1ba890769fa0bfb323913f Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Mon, 25 Nov 2024 17:41:58 +0400 Subject: [PATCH] Migrate kiwix-desktop appimage build to jammy Note that the tag of the kiwix-build CI builder docker image had to be changed to latest since the jammy version doesn't have the old tag. --- .github/scripts/build_definition.py | 3 ++- .github/workflows/cd.yml | 4 +++- .github/workflows/ci.yml | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/scripts/build_definition.py b/.github/scripts/build_definition.py index 49b313a5..541838fb 100644 --- a/.github/scripts/build_definition.py +++ b/.github/scripts/build_definition.py @@ -41,7 +41,8 @@ | focal | flatpak | | | | | BP | | | | focal | native_static | d | d | dBPSD | dBPSD | | linux-x86_64 | linux-x86_64-static | | focal | native_mixed | BPS | BPS | | | | linux-x86_64 | | - | focal | native_dyn | d | d | dB | dB | dBPS | | linux-x86_64-dyn | + | focal | native_dyn | d | d | dB | dB | | | linux-x86_64-dyn | + | jammy | native_dyn | d | d | | | dBPS | | linux-x86_64-dyn | # libzim CI is building alpine_dyn but not us | focal | android_arm | dBP | dBP | | | | android-arm | android-arm | | focal | android_arm64 | dBP | dBP | | | | android-arm64 | android-arm64 | diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9d4068f1..643df015 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -131,12 +131,14 @@ jobs: image_variant: manylinux - config: aarch64_mixed image_variant: manylinux + - config: native_dyn + image_variant: jammy env: HOME: /home/runner SSH_KEY: /tmp/id_rsa runs-on: ubuntu-22.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-06-03" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:latest" options: "--device /dev/fuse --privileged" steps: - name: Checkout code diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a063129e..ad30d7e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,13 +107,15 @@ jobs: image_variant: manylinux - config: aarch64_mixed image_variant: manylinux + - config: native_dyn + image_variant: jammy env: HOME: /home/runner SSH_KEY: /tmp/id_rsa OS_NAME: ${{matrix.image_variant}} runs-on: ubuntu-22.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-06-03" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:latest" options: "--device /dev/fuse --privileged" steps: - name: Checkout code