diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index fb34a87..bf325fc 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -30,11 +30,11 @@ elif PLATFORM_TARGET.startswith("native_"): TARGETS = ("libzim", "libkiwix") else: TARGETS = ("zim-tools", "kiwix-tools") -elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "i586_static"): +elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "aarch64_static", "aarch64_dyn", "i586_static"): TARGETS = ("kiwix-tools",) elif PLATFORM_TARGET == "flatpak": TARGETS = ("kiwix-desktop",) -elif PLATFORM_TARGET == "wasm": +elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"): TARGETS = ("libzim", ) else: TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools") diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py index 772d7e6..99fa421 100755 --- a/.github/scripts/build_release_nightly.py +++ b/.github/scripts/build_release_nightly.py @@ -41,7 +41,7 @@ elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"): TARGETS = ("kiwix-tools",) elif PLATFORM_TARGET == "flatpak": TARGETS = ("kiwix-desktop",) -elif PLATFORM_TARGET == "wasm": +elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"): TARGETS = ("libzim", ) else: TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools") diff --git a/.github/scripts/common.py b/.github/scripts/common.py index 54c35f9..fbea65d 100644 --- a/.github/scripts/common.py +++ b/.github/scripts/common.py @@ -51,6 +51,9 @@ PLATFORM_TO_RELEASE = { "native_static": "{os}-x86_64".format(os=RELEASE_OS_NAME), "win32_static": "win-i686", "armhf_static": "{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_mixed": "{os}-aarch64".format(os=RELEASE_OS_NAME), "i586_static": "{os}-i586".format(os=RELEASE_OS_NAME), "android_arm": "android-arm", "android_arm64": "android-arm64", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fbb656..d37b0ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,10 @@ jobs: - wasm - armhf_static - armhf_dyn + - armhf_mixed + - aarch64_static + - aarch64_dyn + - aarch64_mixed - i586_static - i586_dyn - android_arm diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index 05af7b0..7d8a07a 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -19,6 +19,9 @@ jobs: - native_desktop - wasm - armhf_static + - armhf_mixed + - aarch64_static + - aarch64_mixed - win32_static - i586_static - android_arm @@ -44,6 +47,15 @@ jobs: - target: armhf_static image_variant: bionic lib_postfix: '/x86_64-linux-gnu' + - target: armhf_mixed + image_variant: bionic + lib_postfix: '/x86_64-linux-gnu' + - target: aarch64_static + image_variant: bionic + lib_postfix: '/x86_64-linux-gnu' + - target: aarch64_mixed + image_variant: bionic + lib_postfix: '/x86_64-linux-gnu' - target: win32_static image_variant: f35 lib_postfix: '64'