From 07d1561a87f9dad4563e5b751428ddb572bf44a1 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 30 Nov 2022 12:20:31 +0100 Subject: [PATCH] [CI] Build libkiwix on on native_mixed --- .github/scripts/build_projects.py | 8 ++++---- .github/scripts/build_release_nightly.py | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index ea4fdff..fb34a87 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -20,16 +20,16 @@ if (PLATFORM_TARGET.startswith("android_") elif PLATFORM_TARGET.startswith("native_"): if OS_NAME == "osx": if PLATFORM_TARGET == "native_mixed": - TARGETS = ("libzim", ) + TARGETS = ("libzim", "libkiwix") else: - TARGETS = ("libzim", "zim-tools", "libkiwix") + TARGETS = ("zim-tools", ) else: if DESKTOP: TARGETS = ("kiwix-desktop",) elif PLATFORM_TARGET == "native_mixed": - TARGETS = ("libzim",) + TARGETS = ("libzim", "libkiwix") else: - TARGETS = ("zim-tools", "libkiwix", "kiwix-tools") + TARGETS = ("zim-tools", "kiwix-tools") elif PLATFORM_TARGET in ("win32_static", "armhf_static", "armhf_dyn", "i586_static"): TARGETS = ("kiwix-tools",) elif PLATFORM_TARGET == "flatpak": diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py index 407efe9..772d7e6 100755 --- a/.github/scripts/build_release_nightly.py +++ b/.github/scripts/build_release_nightly.py @@ -26,14 +26,17 @@ if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"): TARGETS = ("libzim", "libkiwix") elif PLATFORM_TARGET.startswith("native_"): if OS_NAME == "osx": - TARGETS = ("libzim", ) if PLATFORM_TARGET == "native_mixed" else ("libzim", "zim-tools", "libkiwix") + if PLATFORM_TARGET == "native_mixed": + TARGETS = ("libzim", "libkiwix") + else: + TARGETS = ("zim-tools", ) else: if DESKTOP: TARGETS = ("kiwix-desktop",) elif PLATFORM_TARGET == "native_mixed": - TARGETS = ("libzim",) + TARGETS = ("libzim", "libkiwix") else: - TARGETS = ("zim-tools", "libkiwix", "kiwix-tools") + TARGETS = ("zim-tools", "kiwix-tools") elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"): TARGETS = ("kiwix-tools",) elif PLATFORM_TARGET == "flatpak":