Skip to content

Commit eb7d626

Browse files
authored
Merge pull request #1497 from delta1/ci/cirrus-macos
ci: fix macos native task
2 parents 8272615 + 6ad3eeb commit eb7d626

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ task:
313313
name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]'
314314
macos_instance:
315315
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
316-
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS
316+
image: ghcr.io/cirruslabs/macos-runner:sequoia # https://cirrus-ci.org/guide/macOS
317317
<< : *MACOS_NATIVE_TASK_TEMPLATE
318318
env:
319319
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

ci/test/00_setup_env_mac_native_arm64.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export HOST=arm64-apple-darwin
10-
# Homebrew's [email protected] is marked as externally managed (PEP 668).
11-
# Therefore, `--break-system-packages` is needed.
12-
export PIP_PACKAGES="--break-system-packages zmq"
10+
export PIP_PACKAGES="zmq"
1311
export GOAL="install"
1412
# ELEMENTS: add -fno-stack-check to work around clang bug on macos
1513
export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports CXXFLAGS=-fno-stack-check"

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1111
fi
1212

1313
if [ "$CI_OS_NAME" == "macos" ]; then
14-
sudo -H pip3 install --upgrade --break-system-packages --ignore-installed pip
14+
sudo -H pip3 install --upgrade --ignore-installed pip
1515
# shellcheck disable=SC2086
1616
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
1717
fi

0 commit comments

Comments
 (0)