Merge pull request #591 from kiwix/fix_arm64_compilation

Fix compilation on CI macOS

.github/scripts/build_projects.py

@@ -9,35 +9,43 @@ from common import (
     upload_archive,
     OS_NAME,
     PLATFORM_TARGET,
-    DESKTOP,
     DEV_BRANCH,
 )
 
-if (PLATFORM_TARGET.startswith("android_")
+
- or PLATFORM_TARGET.startswith("iOS")
+def select_build_target():
- or PLATFORM_TARGET.startswith("macOS")):
+    from common import (
-    TARGETS = ("libzim", "libkiwix")
+        PLATFORM_TARGET,
-elif PLATFORM_TARGET.startswith("native_"):
+        DESKTOP,
-    if OS_NAME == "osx":
+        OS_NAME
-        if PLATFORM_TARGET.endswith("_mixed"):
+    )
-            TARGETS = ("libzim", "libkiwix")
+    if (PLATFORM_TARGET.startswith("android_")
+     or PLATFORM_TARGET.startswith("iOS")
+     or PLATFORM_TARGET.startswith("macOS")):
+        return ("libzim", "libkiwix")
+    elif PLATFORM_TARGET.startswith("native_"):
+        if OS_NAME == "osx":
+            if PLATFORM_TARGET.endswith("_mixed"):
+                return ("libzim", "libkiwix")
+            else:
+                return ("zim-tools", )
         else:
-            TARGETS = ("zim-tools", )
+            if DESKTOP:
+                return ("kiwix-desktop",)
+            elif PLATFORM_TARGET == "native_mixed":
+                return ("libzim", "libkiwix")
+            else:
+                return ("zim-tools", "kiwix-tools")
+    elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "aarch64_static", "aarch64_dyn", "i586_static"):
+        return ("zim-tools", "kiwix-tools")
+    elif PLATFORM_TARGET == "flatpak":
+        return ("kiwix-desktop",)
+    elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):
+        return ("libzim", )
     else:
-        if DESKTOP:
+        return ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
-            TARGETS = ("kiwix-desktop",)
+
-        elif PLATFORM_TARGET == "native_mixed":
+TARGETS = select_build_target()
-            TARGETS = ("libzim", "libkiwix")
-        else:
-            TARGETS = ("zim-tools", "kiwix-tools")
-elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "aarch64_static", "aarch64_dyn", "i586_static"):
-    TARGETS = ("zim-tools", "kiwix-tools")
-elif PLATFORM_TARGET == "flatpak":
-    TARGETS = ("kiwix-desktop",)
-elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):
-    TARGETS = ("libzim", )
-else:
-    TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
 
 for target in TARGETS:
     run_kiwix_build(target, platform=PLATFORM_TARGET)

.github/scripts/build_release_nightly.py

@@ -17,34 +17,13 @@ from common import (
     HOME,
     OS_NAME,
     PLATFORM_TARGET,
-    DESKTOP,
     MAKE_RELEASE,
     notarize_macos_build,
 )
 
-if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"):
+from build_projects import select_build_target
-    TARGETS = ("libzim", "libkiwix")
+
-elif PLATFORM_TARGET.startswith("native_"):
+TARGETS = select_build_target()
-    if OS_NAME == "osx":
-        if PLATFORM_TARGET.endswith("_mixed"):
-            TARGETS = ("libzim", "libkiwix")
-        else:
-            TARGETS = ("zim-tools", )
-    else:
-        if DESKTOP:
-            TARGETS = ("kiwix-desktop",)
-        elif PLATFORM_TARGET == "native_mixed":
-            TARGETS = ("libzim", "libkiwix")
-        else:
-            TARGETS = ("zim-tools", "kiwix-tools")
-elif PLATFORM_TARGET in ("win32_static", "armhf_static", "aarch64_static", "i586_static"):
-    TARGETS = ("zim-tools", "kiwix-tools",)
-elif PLATFORM_TARGET == "flatpak":
-    TARGETS = ("kiwix-desktop",)
-elif PLATFORM_TARGET in ("wasm", "armhf_mixed", "aarch64_mixed"):
-    TARGETS = ("libzim", )
-else:
-    TARGETS = ("libzim", "zim-tools", "libkiwix", "kiwix-tools")
 
 # Filter what to build if we are doing a release.
 if MAKE_RELEASE: