smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use manylinux container instead of bionic 

Alignement of the table in build_definition will be fixed in later commit
to not mix functionnal and cosmetic changes in the same commit.
This commit is contained in:
Matthieu Gautier 2024-05-29 18:11:42 +02:00
parent 82500c545b
commit 683250ca9d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/scripts/build_definition.py vendored
View File

@ -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 |

6
.github/workflows/ci.yml vendored
View File

@ -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

6
.github/workflows/releaseNigthly.yml vendored
View File

@ -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

2
kiwixbuild/dependencies/all_dependencies.py
View File

@ -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 = [