Skip to content

Commit bd47889

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#26388: ci: Use macos-ventura-xcode:14.1 image for "macOS native" task
da16893 ci: Use `macos-ventura-xcode:14.1` image for "macOS native" task (Hennadii Stepanov) 7028365 ci: Make `getopt` path architecture agnostic (Hennadii Stepanov) Pull request description: The "macOS native" CI task always uses the recent OS image. This PR updates it up to the recent macOS release. Cirrus Labs [stopped](bitcoin/bitcoin#25160 (comment)) updating macOS images for `x86_64`, therefore, an `arm64` image been used. Also `make test-security-check` has been dropped as it ["isn't even expected to pass"](bitcoin/bitcoin#26386 (comment)) on `arm64` in CI. ACKs for top commit: Sjors: utACK da16893 Tree-SHA512: 36785d33b7f11b3cdbc53bcfbf97d88bf821fad248c825982dd9f8e3413809a4ef11190eaf950e60fdf479b62ff66920c35d9ea42d534723f015742eec7e19b6
2 parents 39710f5 + da16893 commit bd47889

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.cirrus.yml

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

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

326326
task:
327327
name: 'ARM64 Android APK [focal]'

ci/test/00_setup_env_mac_native_x86_64.sh renamed to ci/test/00_setup_env_mac_native_arm64.sh

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"

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if [ -n "$PIP_PACKAGES" ]; then
7878
if [ "$CI_OS_NAME" == "macos" ]; then
7979
sudo -H pip3 install --upgrade pip
8080
# shellcheck disable=SC2086
81-
IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
81+
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
8282
else
8383
# shellcheck disable=SC2086
8484
${CI_RETRY_EXE} CI_EXEC pip3 install --user $PIP_PACKAGES

0 commit comments

Comments
 (0)