Skip to content

Commit 53938da

Browse files
fanquakedelta1
authored andcommitted
Merge bitcoin/bitcoin#30913: ci: Use macos-14 GHA image (x86_64-apple-darwin22.6.0 -> arm64-apple-darwin23.6.0)
fab932b ci: Remove incorrectly hardcoded HOST in mac_native task (MarcoFalke) fa8f35d ci: Use macos-14 GHA image (MarcoFalke) Pull request description: There shouldn't be any downside, because XCode remains pinned to the same version. However, builds are expected to be a bit faster with M1, which seems nice. ACKs for top commit: hebasto: ACK fab932b. willcl-ark: ACK fab932b Tree-SHA512: 9719e05c67b8b5f3d59bd1a38eef00407b1ae5e123b18151c494b6d2dbf55bd2b0b5bb6c1a0469635c7b3bb5f23990d3bb2f339f56ce3955e8a1b97ac9f295d4 (cherry picked from commit a95e742)
1 parent 431701e commit 53938da

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ jobs:
6969
# Use clang++, because it is a bit faster and uses less memory than g++
7070
git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && ./autogen.sh && CC=clang-15 CXX=clang++-15 ./configure && make clean && make -j $(nproc) check && ./test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }}
7171
72-
macos-native-x86_64:
73-
name: 'macOS 13 native, x86_64, no depends, sqlite only, gui'
72+
macos-native-arm64:
73+
name: 'macOS 14 native, arm64, no depends, sqlite only, gui'
7474
# Use latest image, but hardcode version to avoid silent upgrades (and breaks).
7575
# See: https://github.com/actions/runner-images#available-images.
76-
runs-on: macos-13
76+
runs-on: macos-14
7777

7878
# No need to run on the read-only mirror, unless it is a PR.
7979
if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request'

ci/test/00_setup_env_mac_native.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
export LC_ALL=C.UTF-8
88

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

0 commit comments

Comments
 (0)