smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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_*
This commit is contained in:
Matthieu Gautier 2024-02-02 15:42:26 +01:00
parent 939f323709
commit 6b9a1468fb
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/scripts/build_definition.py vendored
View File

@ -22,16 +22,18 @@ BUILD_DEF = """
| bionic | aarch64_mixed | BP | | | | | linux-aarch64-bionic | | bionic | aarch64_mixed | BP | | | | | linux-aarch64-bionic |
-------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------
# Osx builds, build binaries on native_dyn and native_static. On anyother things, build only the libraries # 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_dyn | d | d | dB | B | | |
| macos | native_static | | | BP | BP | | macos-x86_64 | | macos-13| native_static | | | BP | BP | | macos-x86_64 |
| macos | native_mixed | BP | BP | | | | macos-x86_64 | | macos-14| native_static | | | BP | BP | | macos-arm64 |
| macos | iOS_arm64 | dB | dB | | | | | | macos-13| native_mixed | BP | BP | | | | macos-x86_64 |
| macos | iOSSimulator_x86_64| dB | dB | | | | | | macos-14| native_mixed | BP | BP | | | | macos-arm64 |
| macos | iOSSimulator_arm64 | dB | dB | | | | | | macos.* | iOS_arm64 | dB | dB | | | | |
| macos | macOS_arm64_static | | | BP | BP | | macos-arm64 | | macos.* | iOSSimulator_x86_64| dB | dB | | | | |
| macos | macOS_arm64_mixed | BP | BP | | | | macos-arm64 | | macos.* | iOSSimulator_arm64 | dB | dB | | | | |
| macos | macOS_x86_64 | B | B | | | | | | macos.* | macOS_arm64_static | | | B | B | | |
| macos | apple_all_static | | BP | | | | xcframework | | macos.* | macOS_arm64_mixed | B | B | | | | |
| macos.* | macOS_x86_64 | B | B | | | | |
| macos-13| apple_all_static | | BP | | | | xcframework |
---------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------
| | flatpak | | | | | BP | | | | flatpak | | | | | BP | |
| | native_static | d | d | dBPSD | dBPSD | | linux-x86_64 | | | native_static | d | d | dBPSD | dBPSD | | linux-x86_64 |
@ -109,6 +111,7 @@ SOURCE_PUBLISH = "S"
DEPS = "d" DEPS = "d"
DOCKER = "D" DOCKER = "D"
def select_build_targets(criteria): def select_build_targets(criteria):
from common import PLATFORM_TARGET, OS_NAME from common import PLATFORM_TARGET, OS_NAME
@ -133,6 +136,7 @@ def select_build_targets(criteria):
raise ValueError("No definition match with current context.") raise ValueError("No definition match with current context.")
def get_platform_name(): def get_platform_name():
from common import PLATFORM_TARGET, OS_NAME from common import PLATFORM_TARGET, OS_NAME

12
.github/workflows/ci.yml vendored
View File

@ -153,10 +153,18 @@ jobs:
- macOS_arm64_mixed - macOS_arm64_mixed
- macOS_x86_64 - macOS_x86_64
- apple_all_static - 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: env:
SSH_KEY: /tmp/id_rsa SSH_KEY: /tmp/id_rsa
OS_NAME: macos OS_NAME: ${{matrix.os_name}}
steps: steps:
- name: Set Xcode version (15.0.1) - name: Set Xcode version (15.0.1)
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode

12
.github/workflows/releaseNigthly.yml vendored
View File

@ -139,10 +139,18 @@ jobs:
- macOS_arm64_static - macOS_arm64_static
- macOS_arm64_mixed - macOS_arm64_mixed
- apple_all_static - 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: env:
SSH_KEY: /tmp/id_rsa SSH_KEY: /tmp/id_rsa
OS_NAME: macos OS_NAME: ${{matrix.os_name}}
CERTIFICATE: /tmp/wmch-devid.p12 CERTIFICATE: /tmp/wmch-devid.p12
SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
KEYCHAIN: /Users/runner/build.keychain-db KEYCHAIN: /Users/runner/build.keychain-db