From ab14ce957bd34d36c80744e5b23adbecb6443266 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 27 Apr 2023 19:02:23 +0200 Subject: [PATCH 1/3] Build kiwix-tools on macos (native) --- .github/scripts/build_projects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index 4e7bb98..e8f5b3d 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -30,7 +30,7 @@ def select_build_target(): if PLATFORM_TARGET.endswith("_mixed"): return ("libzim", "libkiwix") else: - return ("zim-tools", ) + return ("zim-tools", "kiwix-tools") else: if DESKTOP: return ("kiwix-desktop",) From 02e2598056d83c32f17417d9e269178e483aaab7 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 27 Apr 2023 19:02:52 +0200 Subject: [PATCH 2/3] Build zim-tools and kiwix-tools and macosOs_arm64. --- .github/scripts/build_projects.py | 8 ++++++-- .github/workflows/releaseNigthly.yml | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index e8f5b3d..4b4c028 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -22,9 +22,13 @@ def select_build_target(): 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")): + or PLATFORM_TARGET.startswith("iOS")): return ("libzim", "libkiwix") + elif PLATFORM_TARGET.startswith("macOS"): + if PLATFORM_TARGET.endswith("_mixed"): + return ("libzim", "libkiwix") + else: + return ("zim-tools", "kiwix-tools") elif PLATFORM_TARGET.startswith("native_"): if OS_NAME == "osx": if PLATFORM_TARGET.endswith("_mixed"): diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index ae974d6..bce3bde 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -177,6 +177,7 @@ jobs: - native_dyn - native_static - native_mixed + - macOS_arm64_static - macOS_arm64_mixed runs-on: macos-12 env: From 8f8ea01aec919c9f7af06308720cd80b00696d92 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 28 Apr 2023 08:59:14 +0200 Subject: [PATCH 3/3] Do not build binaries on macOS not _dyn. Tools fails to compile for different reasons: - Missing dependencies - Use of invalid options (`-dead_strip_dylibs`/`-bitcode_bundle`) --- .github/scripts/build_projects.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index 4b4c028..3db1048 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -27,8 +27,10 @@ def select_build_target(): elif PLATFORM_TARGET.startswith("macOS"): if PLATFORM_TARGET.endswith("_mixed"): return ("libzim", "libkiwix") - else: + elif PLATFORM_TARGET.endswith("_dyn"): return ("zim-tools", "kiwix-tools") + else: + return [] elif PLATFORM_TARGET.startswith("native_"): if OS_NAME == "osx": if PLATFORM_TARGET.endswith("_mixed"):