Merge pull request #589 from kiwix/zim_tools_publication

Build zim-tools cross-compiling.
This commit is contained in:
Matthieu Gautier 2023-04-11 22:58:59 +02:00 committed by GitHub
commit 2cd4f782ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 3 deletions

View File

@ -31,7 +31,7 @@ elif PLATFORM_TARGET.startswith("native_"):
else: else:
TARGETS = ("zim-tools", "kiwix-tools") TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "aarch64_static", "aarch64_dyn", "i586_static"): elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "aarch64_static", "aarch64_dyn", "i586_static"):
TARGETS = ("kiwix-tools",) TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET == "flatpak": elif PLATFORM_TARGET == "flatpak":
TARGETS = ("kiwix-desktop",) TARGETS = ("kiwix-desktop",)
elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"): elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):

View File

@ -38,7 +38,7 @@ elif PLATFORM_TARGET.startswith("native_"):
else: else:
TARGETS = ("zim-tools", "kiwix-tools") TARGETS = ("zim-tools", "kiwix-tools")
elif PLATFORM_TARGET in ("win32_static", "armhf_static", "aarch64_static", "i586_static"): elif PLATFORM_TARGET in ("win32_static", "armhf_static", "aarch64_static", "i586_static"):
TARGETS = ("kiwix-tools",) TARGETS = ("zim-tools", "kiwix-tools",)
elif PLATFORM_TARGET == "flatpak": elif PLATFORM_TARGET == "flatpak":
TARGETS = ("kiwix-desktop",) TARGETS = ("kiwix-desktop",)
elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"): elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):

View File

@ -55,6 +55,7 @@ PLATFORM_TO_RELEASE = {
"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".format(os=RELEASE_OS_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_mixed": "{os}-arm64".format(os=RELEASE_OS_NAME), "macOS_arm64_mixed": "{os}-arm64".format(os=RELEASE_OS_NAME),
"android_arm": "android-arm", "android_arm": "android-arm",
"android_arm64": "android-arm64", "android_arm64": "android-arm64",

View File

@ -136,6 +136,7 @@ jobs:
matrix: matrix:
target: target:
- native_dyn - native_dyn
- native_static
- native_mixed - native_mixed
- iOS_arm64 - iOS_arm64
- iOS_x86_64 - iOS_x86_64

View File

@ -169,8 +169,9 @@ jobs:
matrix: matrix:
target: target:
- native_dyn - native_dyn
- native_static
- native_mixed - native_mixed
- macOs_arm64_mixed - macOS_arm64_mixed
runs-on: macos-12 runs-on: macos-12
env: env:
SSH_KEY: /tmp/id_rsa SSH_KEY: /tmp/id_rsa