Skip to content

Commit a95e742

Browse files
committed
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
2 parents 225718e + fab932b commit a95e742

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ jobs:
7474
# Use clang++, because it is a bit faster and uses less memory than g++
7575
git rebase --exec "echo Running test-one-commit on \$( git log -1 ) && CC=clang CXX=clang++ cmake -B build -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DBUILD_FUZZ_BINARY=ON -DWITH_BDB=ON -DWITH_NATPMP=ON -DWITH_MINIUPNPC=ON -DWITH_USDT=ON && cmake --build build -j $(nproc) && ctest --test-dir build -j $(nproc) && ./build/test/functional/test_runner.py -j $(( $(nproc) * 2 ))" ${{ env.TEST_BASE }}
7676
77-
macos-native-x86_64:
78-
name: 'macOS 13 native, x86_64, no depends, sqlite only, gui'
77+
macos-native-arm64:
78+
name: 'macOS 14 native, arm64, no depends, sqlite only, gui'
7979
# Use latest image, but hardcode version to avoid silent upgrades (and breaks).
8080
# See: https://github.com/actions/runner-images#available-images.
81-
runs-on: macos-13
81+
runs-on: macos-14
8282

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

ci/test/00_setup_env_mac_native.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-apple-darwin
109
# Homebrew's python@3.12 is marked as externally managed (PEP 668).
1110
# Therefore, `--break-system-packages` is needed.
1211
export PIP_PACKAGES="--break-system-packages zmq"

0 commit comments

Comments
 (0)