mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-03 19:51:32 +02:00
Merge bitcoin/bitcoin#31335: macOS: swap docs & CI from pkg-config to pkgconf
fe3457ccfff9a022d9f183e18217422e2e1f7689 ci: note that we should install pkgconf in future (fanquake) 8d203480b338c7504887777a8857e91708deadc7 doc: migrate from pkg-config to pkgconf in macOS build docs (fanquake) Pull request description: Migrate the macOS build docs and CI from `pkg-config` to `pkgconf`. As the former now just redirects to the later. Upstream is currently mass-migrating its formula. i.e https://github.com/Homebrew/homebrew-core/pull/198317. Fixes #31334. ACKs for top commit: maflcko: ACK fe3457ccfff9a022d9f183e18217422e2e1f7689 🍭 hebasto: re-ACK fe3457ccfff9a022d9f183e18217422e2e1f7689. Tree-SHA512: 6e337acb6767d163491149b6ae7181d7d7042bc11cdc745eb6f52d4df6d7a19c4f6daa000b314acd9178f97e670aba145f829e48b1b3033117d7e39cdd3af177
This commit is contained in:
commit
cf57722788
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
@ -109,7 +109,8 @@ 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 coreutils ninja pkg-config gnu-getopt ccache boost libevent zeromq qt@5 qrencode
|
||||
# Update to install pkgconf, once the GHA image has been updated.
|
||||
brew install --quiet coreutils ninja gnu-getopt ccache boost libevent zeromq qt@5 qrencode
|
||||
|
||||
- name: Set Ccache directory
|
||||
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
|
||||
|
@ -48,7 +48,7 @@ See [dependencies.md](dependencies.md) for a complete overview.
|
||||
To install, run the following from your terminal:
|
||||
|
||||
``` bash
|
||||
brew install cmake boost pkg-config libevent
|
||||
brew install cmake boost pkgconf libevent
|
||||
```
|
||||
|
||||
### 4. Clone Bitcoin repository
|
||||
|
Loading…
x
Reference in New Issue
Block a user