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

Also build libzim mixed for aarch64 on bionic.

This commit is contained in:
Matthieu Gautier 2023-04-25 12:17:51 +02:00
parent fffbd122c9
commit fc3b446c76
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/scripts/build_projects.py vendored
View File

@ -19,15 +19,14 @@ def select_build_target():
DESKTOP, DESKTOP,
OS_NAME OS_NAME
) )
if (PLATFORM_TARGET.startswith("android_") if OS_NAME == "bionic" and PLATFORM_TARGET.endswith("_mixed"):
return ("libzim", )
elif (PLATFORM_TARGET.startswith("android_")
or PLATFORM_TARGET.startswith("iOS") or PLATFORM_TARGET.startswith("iOS")
or PLATFORM_TARGET.startswith("macOS")): or PLATFORM_TARGET.startswith("macOS")):
return ("libzim", "libkiwix") return ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"): elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "bionic": if OS_NAME == "osx":
# PLATFORM_TARGET should always be "native_mixed" from CI jobs
return ("libzim", )
elif OS_NAME == "osx":
if PLATFORM_TARGET.endswith("_mixed"): if PLATFORM_TARGET.endswith("_mixed"):
return ("libzim", "libkiwix") return ("libzim", "libkiwix")
else: else:

5
.github/scripts/common.py vendored
View File

@ -45,15 +45,16 @@ else:
DEV_BRANCH = None DEV_BRANCH = None
RELEASE_OS_NAME = "macos" if OS_NAME == "osx" else "linux" RELEASE_OS_NAME = "macos" if OS_NAME == "osx" else "linux"
EXTRA_NAME = "-bionic" if OS_NAME == "bionic" else ""
PLATFORM_TO_RELEASE = { PLATFORM_TO_RELEASE = {
"native_mixed": "{os}-x86_64{extra}".format(os=RELEASE_OS_NAME, extra = "-bionic" if OS_NAME == "bionic" else ""), "native_mixed": "{os}-x86_64{extra}".format(os=RELEASE_OS_NAME, extra=EXTRA_NAME),
"native_static": "{os}-x86_64".format(os=RELEASE_OS_NAME), "native_static": "{os}-x86_64".format(os=RELEASE_OS_NAME),
"win32_static": "win-i686", "win32_static": "win-i686",
"armhf_static": "{os}-armhf".format(os=RELEASE_OS_NAME), "armhf_static": "{os}-armhf".format(os=RELEASE_OS_NAME),
"armhf_mixed": "{os}-armhf".format(os=RELEASE_OS_NAME), "armhf_mixed": "{os}-armhf".format(os=RELEASE_OS_NAME),
"aarch64_static": "{os}-aarch64".format(os=RELEASE_OS_NAME), "aarch64_static": "{os}-aarch64".format(os=RELEASE_OS_NAME),
"aarch64_mixed": "{os}-aarch64".format(os=RELEASE_OS_NAME), "aarch64_mixed": "{os}-aarch64{extra}".format(os=RELEASE_OS_NAME, extra=EXTRA_NAME),
"i586_static": "{os}-i586".format(os=RELEASE_OS_NAME), "i586_static": "{os}-i586".format(os=RELEASE_OS_NAME),
"macOS_arm64_static": "{os}-arm64".format(os=RELEASE_OS_NAME), "macOS_arm64_static": "{os}-arm64".format(os=RELEASE_OS_NAME),
"macOS_arm64_mixed": "{os}-arm64".format(os=RELEASE_OS_NAME), "macOS_arm64_mixed": "{os}-arm64".format(os=RELEASE_OS_NAME),

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

@ -34,6 +34,9 @@ jobs:
- target: native_mixed - target: native_mixed
image_variant: bionic image_variant: bionic
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: aarch64_mixed
image_variant: bionic
lib_postfix: '/aarch64-linux-gnu'
- target: win32_static - target: win32_static
image_variant: f35 image_variant: f35
lib_postfix: '64' lib_postfix: '64'

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

@ -59,6 +59,9 @@ jobs:
- target: aarch64_mixed - target: aarch64_mixed
image_variant: focal image_variant: focal
lib_postfix: '/x86_64-linux-gnu' lib_postfix: '/x86_64-linux-gnu'
- target: aarch64_mixed
image_variant: bionic
lib_postfix: '/aarch64-linux-gnu'
- target: win32_static - target: win32_static
image_variant: f35 image_variant: f35
lib_postfix: '64' lib_postfix: '64'