From 479b9908a96b34faf4e378f92e0b2ac128cebcb9 Mon Sep 17 00:00:00 2001 From: merge-script Date: Tue, 17 Sep 2024 15:11:35 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#30913: ci: Use macos-14 GHA image (x86_64-apple-darwin22.6.0 -> arm64-apple-darwin23.6.0) fab932b4211ea0a4c10e484c08042552f9c58c15 ci: Remove incorrectly hardcoded HOST in mac_native task (MarcoFalke) fa8f35d786506eadfde3521e949bf5cdb4eb0003 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 fab932b4211ea0a4c10e484c08042552f9c58c15. willcl-ark: ACK fab932b4211ea0a4c10e484c08042552f9c58c15 Tree-SHA512: 9719e05c67b8b5f3d59bd1a38eef00407b1ae5e123b18151c494b6d2dbf55bd2b0b5bb6c1a0469635c7b3bb5f23990d3bb2f339f56ce3955e8a1b97ac9f295d4 (cherry picked from commit a95e742b69207d7541afc6903b3fd72131f4d6de) --- .github/workflows/ci.yml | 6 +++--- ci/test/00_setup_env_mac_native.sh | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd156fe441..60a8e2aba0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,11 +69,11 @@ jobs: # Use clang++, because it is a bit faster and uses less memory than g++ 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 }} - macos-native-x86_64: - name: 'macOS 13 native, x86_64, no depends, sqlite only, gui' + macos-native-arm64: + name: 'macOS 14 native, arm64, no depends, sqlite only, gui' # Use latest image, but hardcode version to avoid silent upgrades (and breaks). # See: https://github.com/actions/runner-images#available-images. - runs-on: macos-13 + runs-on: macos-14 # No need to run on the read-only mirror, unless it is a PR. if: github.repository != 'bitcoin-core/gui' || github.event_name == 'pull_request' diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index f51f024e06..246afc08b8 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -6,8 +6,9 @@ export LC_ALL=C.UTF-8 -export HOST=arm64-apple-darwin -export PIP_PACKAGES="zmq" +# Homebrew's python@3.12 is marked as externally managed (PEP 668). +# Therefore, `--break-system-packages` is needed. +export PIP_PACKAGES="--break-system-packages zmq" export GOAL="install" # ELEMENTS: add -fno-stack-check to work around clang bug on macos export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports CXXFLAGS=-fno-stack-check"