diff options
| author | merge-script <fanquake@gmail.com> | 2024-09-18 10:16:14 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-09-18 10:16:14 +0100 |
| commit | 6b97882ab53e8a7edc656eb1958eac3938e3b73d (patch) | |
| tree | 39d38ef292142558d80fde93b9720d556fa288d8 | |
| parent | 6fc4692797121b54de0c54e5b09ee47f322c038a (diff) | |
| parent | d01b85bfecbcf16ea16f90e2ade7537bf582269f (diff) | |
| download | bitcoin-6b97882ab53e8a7edc656eb1958eac3938e3b73d.tar.xz | |
Merge bitcoin/bitcoin#30915: ci: Use `ninja` to build in macOS native CI job
d01b85bfecbcf16ea16f90e2ade7537bf582269f ci: Use `ninja` to build in macOS native CI job (Hennadii Stepanov)
Pull request description:
This PR addresses [this](https://github.com/bitcoin/bitcoin/pull/30911#issuecomment-2354922939) comment:
> I wonder if one CI task should be using Ninja (and cmake >= 3.27), if it isn't too hard to implement. Otherwise this config will remain untested and errors may sneak in to the master branch, only being detected after merge.
ACKs for top commit:
maflcko:
review ACK d01b85bfecbcf16ea16f90e2ade7537bf582269f
theuni:
ACK d01b85bfecbcf16ea16f90e2ade7537bf582269f.
jonatack:
ACK d01b85bfecbcf16ea16f90e2ade7537bf582269f
jarolrod:
ACK d01b85bfecbcf16ea16f90e2ade7537bf582269f
Tree-SHA512: 5cbbc87f0e48512441a4f0cf10af2f6d73f24d3e8667b338b176fd1667fd5d7739349bcede3aeef973497ff67d33cb8f7d7f3681c3ede8e8b2f673b853d5bc63
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_mac_native.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67e95ae3c7..99be137a24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: run: | # A workaround for "The `brew link` step did not complete successfully" error. brew install --quiet python@3 || brew link --overwrite python@3 - brew install --quiet pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode + brew install --quiet ninja pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode - name: Set Ccache directory run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV" diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index f6dff785ca..896405bc71 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -10,6 +10,7 @@ export LC_ALL=C.UTF-8 # Therefore, `--break-system-packages` is needed. export PIP_PACKAGES="--break-system-packages zmq" export GOAL="install" +export CMAKE_GENERATOR="Ninja" export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DWITH_MINIUPNPC=ON -DWITH_NATPMP=ON -DREDUCE_EXPORTS=ON" export CI_OS_NAME="macos" export NO_DEPENDS=1 |