Build and publish libzim and libkiwix on macos_arm64.

This commit is contained in:
Matthieu Gautier 2023-03-29 14:57:44 +02:00
parent de25a1e63b
commit b4e0d60363
4 changed files with 5 additions and 3 deletions

View File

@ -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", )

View File

@ -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)

View File

@ -141,6 +141,7 @@ jobs:
- iOS_x86_64
- iOS_Mac_ABI
- macOS_arm64
- macOS_arm64_mixed
- macOS_x86_64
runs-on: macos-latest
env:

View File

@ -170,6 +170,7 @@ jobs:
target:
- native_dyn
- native_mixed
- macOs_arm64_mixed
runs-on: macos-12
env:
SSH_KEY: /tmp/id_rsa