Skip to content

Commit 14f162d

Browse files
committed
Merge bitcoin/bitcoin#31399: ci, macos: Install pkgconf Homebrew's package
e2f2698 ci, macos: Install `pkgconf` Homebrew's package (Hennadii Stepanov) Pull request description: The updated GHA image [`20241125.556`](https://github.com/actions/runner-images/releases/tag/macos-14-arm64%2F20241125.556) is now fully [deployed](https://github.com/actions/runner-images/blob/main/README.md#available-images), enabling the installation of `pkgconf` as documented in [`doc/build-osx.md`](https://github.com/bitcoin/bitcoin/blob/master/doc/build-osx.md#3-install-required-dependencies). ACKs for top commit: TheCharlatan: Lgtm ACK e2f2698 Tree-SHA512: 9c9a3e9a3998097ed029aede61879c0e0ddd30e6bf1c36927887d7c38f3af13580efaf0fee0d75fdf344c5e92242530d4454560c62e75ba3f81c7f99d112e3f5
2 parents dbc8ba1 + e2f2698 commit 14f162d

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ jobs:
120120
run: |
121121
# A workaround for "The `brew link` step did not complete successfully" error.
122122
brew install --quiet python@3 || brew link --overwrite python@3
123-
# Update to install pkgconf, once the GHA image has been updated.
124-
brew install --quiet coreutils ninja gnu-getopt ccache boost libevent zeromq qt@5 qrencode
123+
brew install --quiet coreutils ninja pkgconf gnu-getopt ccache boost libevent zeromq qt@5 qrencode
125124
126125
- name: Set Ccache directory
127126
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)