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

Merge pull request #702 from kiwix/no_bionic

This commit is contained in:
Matthieu Gautier 2024-06-03 16:53:39 +02:00 committed by GitHub
parent 82500c545b 8832888aaa
commit f4e2f0a845
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 52 additions and 52 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 = """ BUILD_DEF = """
| OS_NAME | COMPILE_CONFIG | libzim | libkiwix | zim-tools | kiwix-tools | kiwix-desktop | platform_name | dependency_name | | 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 # manylinux is a special case as we need to compile libzim on old arch for python
| bionic | native_mixed | BP | | | | | linux-x86_64-bionic | | | manylinux | native_mixed | BP | | | | | linux-x86_64-manylinux | |
| bionic | aarch64_mixed | BP | | | | | linux-aarch64-bionic | | | manylinux | aarch64_mixed | BP | | | | | linux-aarch64-manylinux | |
---------------------------------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------
# Osx builds, build binaries on native_dyn and native_static. On anyother things, build only the libraries # 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 | | 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'] image_variant: ['focal']
include: include:
- config: native_mixed - config: native_mixed
image_variant: bionic image_variant: manylinux
- config: aarch64_mixed - config: aarch64_mixed
image_variant: bionic image_variant: manylinux
- config: win32_static - config: win32_static
image_variant: f35 image_variant: f35
- config: win32_dyn - config: win32_dyn
@ -50,7 +50,7 @@ jobs:
SSH_KEY: /tmp/id_rsa SSH_KEY: /tmp/id_rsa
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
container: 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" options: "--device /dev/fuse --privileged"
steps: steps:
- name: Checkout code - name: Checkout code

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

@ -35,9 +35,9 @@ jobs:
image_variant: ['focal'] image_variant: ['focal']
include: include:
- config: native_mixed - config: native_mixed
image_variant: bionic image_variant: manylinux
- config: aarch64_mixed - config: aarch64_mixed
image_variant: bionic image_variant: manylinux
- config: win32_static - config: win32_static
image_variant: f35 image_variant: f35
env: env:
@ -45,7 +45,7 @@ jobs:
SSH_KEY: /tmp/id_rsa SSH_KEY: /tmp/id_rsa
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
container: 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" options: "--device /dev/fuse --privileged"
steps: steps:
- name: Checkout code - name: Checkout code

2
kiwixbuild/configs/armhf.py
View File

@ -6,7 +6,7 @@ from kiwixbuild._global import get_target_step
# Base config for arm # Base config for arm
class ArmConfigInfo(ConfigInfo): class ArmConfigInfo(ConfigInfo):
compatible_hosts = ["fedora", "debian"] compatible_hosts = ["fedora", "debian", "almalinux"]
def get_cross_config(self): def get_cross_config(self):
return { return {

6
kiwixbuild/configs/native.py
View File

@ -29,16 +29,16 @@ class NativeConfigInfo(ConfigInfo):
class NativeDyn(NativeConfigInfo): class NativeDyn(NativeConfigInfo):
name = "native_dyn" name = "native_dyn"
static = False static = False
compatible_hosts = ["fedora", "debian", "Darwin"] compatible_hosts = ["fedora", "debian", "Darwin", "almalinux"]
class NativeStatic(NativeConfigInfo): class NativeStatic(NativeConfigInfo):
name = "native_static" name = "native_static"
static = True static = True
compatible_hosts = ["fedora", "debian", "Darwin"] compatible_hosts = ["fedora", "debian", "Darwin", "almalinux"]
class NativeMixed(MixedMixin("native_static"), NativeConfigInfo): class NativeMixed(MixedMixin("native_static"), NativeConfigInfo):
name = "native_mixed" name = "native_mixed"
static = False static = False
compatible_hosts = ["fedora", "debian", "Darwin"] compatible_hosts = ["fedora", "debian", "Darwin", "almalinux"]

2
kiwixbuild/dependencies/all_dependencies.py
View File

@ -13,7 +13,7 @@ class AllBaseDependencies(Dependency):
class Builder(NoopBuilder): class Builder(NoopBuilder):
@classmethod @classmethod
def get_dependencies(cls, configInfo, allDeps): 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"] return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"]
base_deps = [ base_deps = [