Skip to content

Commit 95ec960

Browse files
hebastoMarcoFalke
authored andcommitted
ci: Use macos-ventura-xcode:14.1 image for "macOS native" task
Github-Pull: #26388 Rebased-From: da16893
1 parent 50ad39d commit 95ec960

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,16 +314,16 @@ task:
314314
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
315315

316316
task:
317-
name: 'macOS 12 native x86_64 [gui, system sqlite] [no depends]'
317+
name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]'
318318
macos_instance:
319319
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
320-
image: monterey-xcode-13.3 # https://cirrus-ci.org/guide/macOS
320+
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS
321321
<< : *MACOS_NATIVE_TASK_TEMPLATE
322322
env:
323323
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
324324
CI_USE_APT_INSTALL: "no"
325325
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
326-
FILE_ENV: "./ci/test/00_setup_env_mac_native_x86_64.sh"
326+
FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
327327

328328
task:
329329
name: 'ARM64 Android APK [focal]'
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-apple-darwin
10-
export PIP_PACKAGES="zmq lief"
9+
export HOST=arm64-apple-darwin
10+
export PIP_PACKAGES="zmq"
1111
export GOAL="install"
12-
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"
12+
export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports"
1313
export CI_OS_NAME="macos"
1414
export NO_DEPENDS=1
1515
export OSX_SDK=""
1616
export CCACHE_SIZE=300M
17-
export RUN_SECURITY_TESTS="true"

0 commit comments

Comments
 (0)