diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index bf325fc..7a67a34 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -19,7 +19,7 @@ if (PLATFORM_TARGET.startswith("android_") TARGETS = ("libzim", "libkiwix") elif PLATFORM_TARGET.startswith("native_"): if OS_NAME == "osx": - if PLATFORM_TARGET == "native_mixed": + if PLATFORM_TARGET.endswith("_mixed"): TARGETS = ("libzim", "libkiwix") else: TARGETS = ("zim-tools", ) diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py index 168359a..f21cb5a 100755 --- a/.github/scripts/build_release_nightly.py +++ b/.github/scripts/build_release_nightly.py @@ -26,7 +26,7 @@ if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"): TARGETS = ("libzim", "libkiwix") elif PLATFORM_TARGET.startswith("native_"): if OS_NAME == "osx": - if PLATFORM_TARGET == "native_mixed": + if PLATFORM_TARGET.endswith("_mixed"): TARGETS = ("libzim", "libkiwix") else: TARGETS = ("zim-tools", ) @@ -57,7 +57,7 @@ for target in TARGETS: if target == "kiwix-desktop": archive = create_desktop_image(make_release=MAKE_RELEASE) else: - if PLATFORM_TARGET == "native_mixed" and OS_NAME == "osx": + if OS_NAME == "osx" and PLATFORM_TARGET.endswith("_mixed"): fix_macos_rpath(target) notarize_macos_build(target) archive = make_archive(target, make_release=MAKE_RELEASE) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d37b0ad..ed5224c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,6 +141,7 @@ jobs: - iOS_x86_64 - iOS_Mac_ABI - macOS_arm64 + - macOS_arm64_mixed - macOS_x86_64 runs-on: macos-latest env: diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index 7d8a07a..8586dee 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -170,6 +170,7 @@ jobs: target: - native_dyn - native_mixed + - macOs_arm64_mixed runs-on: macos-12 env: SSH_KEY: /tmp/id_rsa