diff --git a/.github/scripts/build_definition.py b/.github/scripts/build_definition.py index 5b38c0e..d4514c7 100644 --- a/.github/scripts/build_definition.py +++ b/.github/scripts/build_definition.py @@ -17,9 +17,9 @@ import csv, io, re BUILD_DEF = """ | OS_NAME | COMPILE_CONFIG | libzim | libkiwix | zim-tools | kiwix-tools | kiwix-desktop | platform_name | dependency_name | ============================================================================================================================================== -# Bionic is a special case as we need to compile libzim on old arch for python - | bionic | native_mixed | BP | | | | | linux-x86_64-bionic | | - | bionic | aarch64_mixed | BP | | | | | linux-aarch64-bionic | | +# manylinux is a special case as we need to compile libzim on old arch for python + | manylinux | native_mixed | BP | | | | | linux-x86_64-manylinux | | + | manylinux | aarch64_mixed | BP | | | | | linux-aarch64-manylinux | | ---------------------------------------------------------------------------------------------------------------------------------------------- # Osx builds, build binaries on native_dyn and native_static. On anyother things, build only the libraries | macos | native_dyn | d | d | dB | B | | | macos-x86_64-dyn | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd61634..b87a0fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,9 @@ jobs: image_variant: ['focal'] include: - config: native_mixed - image_variant: bionic + image_variant: manylinux - config: aarch64_mixed - image_variant: bionic + image_variant: manylinux - config: win32_static image_variant: f35 - config: win32_dyn @@ -50,7 +50,7 @@ jobs: SSH_KEY: /tmp/id_rsa runs-on: ubuntu-22.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2023-10-30" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-06-03" options: "--device /dev/fuse --privileged" steps: - name: Checkout code diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index 26e4e5b..fedf5d6 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -35,9 +35,9 @@ jobs: image_variant: ['focal'] include: - config: native_mixed - image_variant: bionic + image_variant: manylinux - config: aarch64_mixed - image_variant: bionic + image_variant: manylinux - config: win32_static image_variant: f35 env: @@ -45,7 +45,7 @@ jobs: SSH_KEY: /tmp/id_rsa runs-on: ubuntu-22.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2023-10-30" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-06-03" options: "--device /dev/fuse --privileged" steps: - name: Checkout code diff --git a/kiwixbuild/dependencies/all_dependencies.py b/kiwixbuild/dependencies/all_dependencies.py index 18cbeb7..f1be7c2 100644 --- a/kiwixbuild/dependencies/all_dependencies.py +++ b/kiwixbuild/dependencies/all_dependencies.py @@ -13,7 +13,7 @@ class AllBaseDependencies(Dependency): class Builder(NoopBuilder): @classmethod def get_dependencies(cls, configInfo, allDeps): - if configInfo.build == "wasm" or environ.get("OS_NAME") == "bionic": + if configInfo.build == "wasm" or environ.get("OS_NAME") == "manylinux": return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"] base_deps = [