ci: Use macos-ventura-xcode:14.1 image for "macOS native" task

Github-Pull: #26388
Rebased-From: da16893474
This commit is contained in:
Hennadii Stepanov 2022-10-25 09:49:16 +01:00 committed by MarcoFalke
parent 50ad39d9d0
commit 95ec9604a4
2 changed files with 6 additions and 7 deletions

View file

@ -314,16 +314,16 @@ task:
FILE_ENV: "./ci/test/00_setup_env_mac.sh" FILE_ENV: "./ci/test/00_setup_env_mac.sh"
task: task:
name: 'macOS 12 native x86_64 [gui, system sqlite] [no depends]' name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]'
macos_instance: macos_instance:
# Use latest image, but hardcode version to avoid silent upgrades (and breaks) # Use latest image, but hardcode version to avoid silent upgrades (and breaks)
image: monterey-xcode-13.3 # https://cirrus-ci.org/guide/macOS image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS
<< : *MACOS_NATIVE_TASK_TEMPLATE << : *MACOS_NATIVE_TASK_TEMPLATE
env: env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
CI_USE_APT_INSTALL: "no" CI_USE_APT_INSTALL: "no"
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
FILE_ENV: "./ci/test/00_setup_env_mac_native_x86_64.sh" FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
task: task:
name: 'ARM64 Android APK [focal]' name: 'ARM64 Android APK [focal]'

View file

@ -6,12 +6,11 @@
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export HOST=x86_64-apple-darwin export HOST=arm64-apple-darwin
export PIP_PACKAGES="zmq lief" export PIP_PACKAGES="zmq"
export GOAL="install" export GOAL="install"
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports" export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports"
export CI_OS_NAME="macos" export CI_OS_NAME="macos"
export NO_DEPENDS=1 export NO_DEPENDS=1
export OSX_SDK="" export OSX_SDK=""
export CCACHE_SIZE=300M export CCACHE_SIZE=300M
export RUN_SECURITY_TESTS="true"