Skip to content

Commit 6b97882

Browse files
committed
Merge bitcoin/bitcoin#30915: ci: Use ninja to build in macOS native CI job
d01b85b ci: Use `ninja` to build in macOS native CI job (Hennadii Stepanov) Pull request description: This PR addresses [this](bitcoin/bitcoin#30911 (comment)) 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 d01b85b theuni: ACK d01b85b. jonatack: ACK d01b85b jarolrod: ACK d01b85b Tree-SHA512: 5cbbc87f0e48512441a4f0cf10af2f6d73f24d3e8667b338b176fd1667fd5d7739349bcede3aeef973497ff67d33cb8f7d7f3681c3ede8e8b2f673b853d5bc63
2 parents 6fc4692 + d01b85b commit 6b97882

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
# A workaround for "The `brew link` step did not complete successfully" error.
107107
brew install --quiet python@3 || brew link --overwrite python@3
108-
brew install --quiet pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode
108+
brew install --quiet ninja pkg-config gnu-getopt ccache boost libevent miniupnpc libnatpmp zeromq qt@5 qrencode
109109
110110
- name: Set Ccache directory
111111
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"

ci/test/00_setup_env_mac_native.sh

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export LC_ALL=C.UTF-8
1010
# Therefore, `--break-system-packages` is needed.
1111
export PIP_PACKAGES="--break-system-packages zmq"
1212
export GOAL="install"
13+
export CMAKE_GENERATOR="Ninja"
1314
export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DWITH_MINIUPNPC=ON -DWITH_NATPMP=ON -DREDUCE_EXPORTS=ON"
1415
export CI_OS_NAME="macos"
1516
export NO_DEPENDS=1

0 commit comments

Comments
 (0)