From c499826aaf245004d6b689041cbe4ce27bf6b5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 22 Nov 2024 11:55:45 +0100 Subject: [PATCH] ci: fix macOS dep conflict MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pkgconf is a newer, actively maintained implementation of pkg-config. Signed-off-by: László Várady --- .github/workflows/macos.yml | 3 +++ contrib/Brewfile | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 951b07c16..163e81ee6 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/contrib/Brewfile b/contrib/Brewfile index 9c328124e..f73b1e0d1 100644 --- a/contrib/Brewfile +++ b/contrib/Brewfile @@ -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" @@ -26,7 +25,6 @@ brew "python@3", link: true, force: true brew "rabbitmq-c" brew "riemann-client" brew "libpaho-mqtt" - brew "grpc" brew "criterion"