From 6b9a1468fb0c943aaad7cd6cea3bf5d125c4bf28 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 2 Feb 2024 15:42:26 +0100 Subject: [PATCH] Build on macos-13 AND macos-14 As macos-14 is arm64, we do not publish for macos-arm64 using cross-compilation but directly use native_* --- .github/scripts/build_definition.py | 24 ++++++++++++++---------- .github/workflows/ci.yml | 12 ++++++++++-- .github/workflows/releaseNigthly.yml | 12 ++++++++++-- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/scripts/build_definition.py b/.github/scripts/build_definition.py index 01fb906..5f9ebb4 100644 --- a/.github/scripts/build_definition.py +++ b/.github/scripts/build_definition.py @@ -22,16 +22,18 @@ BUILD_DEF = """ | bionic | aarch64_mixed | BP | | | | | linux-aarch64-bionic | -------------------------------------------------------------------------------------------------------------------- # Osx builds, build binaries on native_dyn and native_static. On anyother things, build only the libraries - | macos | native_dyn | d | d | dB | B | | | - | macos | native_static | | | BP | BP | | macos-x86_64 | - | macos | native_mixed | BP | BP | | | | macos-x86_64 | - | macos | iOS_arm64 | dB | dB | | | | | - | macos | iOSSimulator_x86_64| dB | dB | | | | | - | macos | iOSSimulator_arm64 | dB | dB | | | | | - | macos | macOS_arm64_static | | | BP | BP | | macos-arm64 | - | macos | macOS_arm64_mixed | BP | BP | | | | macos-arm64 | - | macos | macOS_x86_64 | B | B | | | | | - | macos | apple_all_static | | BP | | | | xcframework | + | macos.* | native_dyn | d | d | dB | B | | | + | macos-13| native_static | | | BP | BP | | macos-x86_64 | + | macos-14| native_static | | | BP | BP | | macos-arm64 | + | macos-13| native_mixed | BP | BP | | | | macos-x86_64 | + | macos-14| native_mixed | BP | BP | | | | macos-arm64 | + | macos.* | iOS_arm64 | dB | dB | | | | | + | macos.* | iOSSimulator_x86_64| dB | dB | | | | | + | macos.* | iOSSimulator_arm64 | dB | dB | | | | | + | macos.* | macOS_arm64_static | | | B | B | | | + | macos.* | macOS_arm64_mixed | B | B | | | | | + | macos.* | macOS_x86_64 | B | B | | | | | + | macos-13| apple_all_static | | BP | | | | xcframework | ---------------------------------------------------------------------------------------------- | | flatpak | | | | | BP | | | | native_static | d | d | dBPSD | dBPSD | | linux-x86_64 | @@ -109,6 +111,7 @@ SOURCE_PUBLISH = "S" DEPS = "d" DOCKER = "D" + def select_build_targets(criteria): from common import PLATFORM_TARGET, OS_NAME @@ -133,6 +136,7 @@ def select_build_targets(criteria): raise ValueError("No definition match with current context.") + def get_platform_name(): from common import PLATFORM_TARGET, OS_NAME diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da9d298..99e5e90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -153,10 +153,18 @@ jobs: - macOS_arm64_mixed - macOS_x86_64 - apple_all_static - runs-on: macos-13 + os: + - macos-13 + - macos-14 + include: + - os: macos-13 + os_name: macos-x86_46 + - os: macos-14 + os_name: macos-arm64 + runs-on: ${{matrix.os}} env: SSH_KEY: /tmp/id_rsa - OS_NAME: macos + OS_NAME: ${{matrix.os_name}} steps: - name: Set Xcode version (15.0.1) # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml index 32c48d2..46dbc93 100644 --- a/.github/workflows/releaseNigthly.yml +++ b/.github/workflows/releaseNigthly.yml @@ -139,10 +139,18 @@ jobs: - macOS_arm64_static - macOS_arm64_mixed - apple_all_static - runs-on: macos-13 + os: + - macos-13 + - macos-14 + include: + - os: macos-13 + os_name: macos-x86_46 + - os: macos-14 + os_name: macos-arm64 + runs-on: ${{matrix.os}} env: SSH_KEY: /tmp/id_rsa - OS_NAME: macos + OS_NAME: ${{matrix.os_name}} CERTIFICATE: /tmp/wmch-devid.p12 SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} KEYCHAIN: /Users/runner/build.keychain-db