From fc3b446c76105c8e8c6bfe372095177e887dbb90 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 25 Apr 2023 12:17:51 +0200
Subject: [PATCH] Also build libzim mixed for aarch64 on bionic.

---
 .github/scripts/build_projects.py    | 9 ++++-----
 .github/scripts/common.py            | 5 +++--
 .github/workflows/ci.yml             | 3 +++
 .github/workflows/releaseNigthly.yml | 3 +++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py
index 569327d..4e7bb98 100755
--- a/.github/scripts/build_projects.py
+++ b/.github/scripts/build_projects.py
@@ -19,15 +19,14 @@ def select_build_target():
         DESKTOP,
         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("macOS")):
         return ("libzim", "libkiwix")
     elif PLATFORM_TARGET.startswith("native_"):
-        if OS_NAME == "bionic":
-            # PLATFORM_TARGET should always be "native_mixed" from CI jobs
-            return ("libzim", )
-        elif OS_NAME == "osx":
+        if OS_NAME == "osx":
             if PLATFORM_TARGET.endswith("_mixed"):
                 return ("libzim", "libkiwix")
             else:
diff --git a/.github/scripts/common.py b/.github/scripts/common.py
index 647661f..a8abd93 100644
--- a/.github/scripts/common.py
+++ b/.github/scripts/common.py
@@ -45,15 +45,16 @@ else:
     DEV_BRANCH = None
 
 RELEASE_OS_NAME = "macos" if OS_NAME == "osx" else "linux"
+EXTRA_NAME = "-bionic" if OS_NAME == "bionic" else ""
 
 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),
     "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),
+    "aarch64_mixed": "{os}-aarch64{extra}".format(os=RELEASE_OS_NAME, extra=EXTRA_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),
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69a9570..ac2aa69 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,9 @@ jobs:
           - target: native_mixed
             image_variant: bionic
             lib_postfix: '/x86_64-linux-gnu'
+          - target: aarch64_mixed
+            image_variant: bionic
+            lib_postfix: '/aarch64-linux-gnu'
           - target: win32_static
             image_variant: f35
             lib_postfix: '64'
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index cee7918..ae974d6 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.github/workflows/releaseNigthly.yml
@@ -59,6 +59,9 @@ jobs:
           - target: aarch64_mixed
             image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
+          - target: aarch64_mixed
+            image_variant: bionic
+            lib_postfix: '/aarch64-linux-gnu'
           - target: win32_static
             image_variant: f35
             lib_postfix: '64'