Addapt CI to build armhf and aarch64.
- Aarch64 added - libzim compilation on (armhf|aarch64)_mixed added.
This commit is contained in:
parent
7ae3afd805
commit
8e61acbca2
|
@ -30,11 +30,11 @@ elif PLATFORM_TARGET.startswith("native_"):
|
||||||
TARGETS = ("libzim", "libkiwix")
|
TARGETS = ("libzim", "libkiwix")
|
||||||
else:
|
else:
|
||||||
TARGETS = ("zim-tools", "kiwix-tools")
|
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",)
|
TARGETS = ("kiwix-tools",)
|
||||||
elif PLATFORM_TARGET == "flatpak":
|
elif PLATFORM_TARGET == "flatpak":
|
||||||
TARGETS = ("kiwix-desktop",)
|
TARGETS = ("kiwix-desktop",)
|
||||||
elif PLATFORM_TARGET == "wasm":
|
elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):
|
||||||
TARGETS = ("libzim", )
|
TARGETS = ("libzim", )
|
||||||
else:
|
else:
|
||||||
TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
|
TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
|
||||||
|
|
|
@ -41,7 +41,7 @@ elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"):
|
||||||
TARGETS = ("kiwix-tools",)
|
TARGETS = ("kiwix-tools",)
|
||||||
elif PLATFORM_TARGET == "flatpak":
|
elif PLATFORM_TARGET == "flatpak":
|
||||||
TARGETS = ("kiwix-desktop",)
|
TARGETS = ("kiwix-desktop",)
|
||||||
elif PLATFORM_TARGET == "wasm":
|
elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):
|
||||||
TARGETS = ("libzim", )
|
TARGETS = ("libzim", )
|
||||||
else:
|
else:
|
||||||
TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
|
TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
|
||||||
|
|
|
@ -51,6 +51,9 @@ PLATFORM_TO_RELEASE = {
|
||||||
"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),
|
||||||
|
"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),
|
"i586_static": "{os}-i586".format(os=RELEASE_OS_NAME),
|
||||||
"android_arm": "android-arm",
|
"android_arm": "android-arm",
|
||||||
"android_arm64": "android-arm64",
|
"android_arm64": "android-arm64",
|
||||||
|
|
|
@ -18,6 +18,10 @@ jobs:
|
||||||
- wasm
|
- wasm
|
||||||
- armhf_static
|
- armhf_static
|
||||||
- armhf_dyn
|
- armhf_dyn
|
||||||
|
- armhf_mixed
|
||||||
|
- aarch64_static
|
||||||
|
- aarch64_dyn
|
||||||
|
- aarch64_mixed
|
||||||
- i586_static
|
- i586_static
|
||||||
- i586_dyn
|
- i586_dyn
|
||||||
- android_arm
|
- android_arm
|
||||||
|
|
|
@ -19,6 +19,9 @@ jobs:
|
||||||
- native_desktop
|
- native_desktop
|
||||||
- wasm
|
- wasm
|
||||||
- armhf_static
|
- armhf_static
|
||||||
|
- armhf_mixed
|
||||||
|
- aarch64_static
|
||||||
|
- aarch64_mixed
|
||||||
- win32_static
|
- win32_static
|
||||||
- i586_static
|
- i586_static
|
||||||
- android_arm
|
- android_arm
|
||||||
|
@ -44,6 +47,15 @@ jobs:
|
||||||
- target: armhf_static
|
- target: armhf_static
|
||||||
image_variant: bionic
|
image_variant: bionic
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
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
|
- target: win32_static
|
||||||
image_variant: f35
|
image_variant: f35
|
||||||
lib_postfix: '64'
|
lib_postfix: '64'
|
||||||
|
|
Loading…
Reference in New Issue