Skip to content

Commit

Permalink
ci: fix macOS dep conflict
Browse files Browse the repository at this point in the history
pkgconf is a newer, actively maintained implementation of pkg-config.

Signed-off-by: László Várady <[email protected]>
  • Loading branch information
MrAnno committed Nov 22, 2024
1 parent 8f77f52 commit c499826
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ jobs:
- name: Install dependencies
run: |
# workaround for outdated GitHub Actions runners
brew uninstall pkg-config || :
brew update --preinstall
brew bundle --file=contrib/Brewfile
Expand Down
4 changes: 1 addition & 3 deletions contrib/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ brew "automake"
brew "binutils"
brew "bison"
brew "flex"
brew "gcc@11"
brew "glib"
brew "ivykis"
brew "json-c"
brew "libtool"
brew "openssl@3"
brew "pcre2"
brew "pkg-config"
brew "pkgconf"

brew "curl"
brew "gradle"
Expand All @@ -26,7 +25,6 @@ brew "python@3", link: true, force: true
brew "rabbitmq-c"
brew "riemann-client"
brew "libpaho-mqtt"

brew "grpc"

brew "criterion"

0 comments on commit c499826

Please sign in to comment.