From 5e584ee7d90d767e1d68030aa2b04b950a0bc9f9 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sun, 24 Nov 2024 09:36:24 +0200 Subject: [PATCH] [ci] Try to fix homebrew pkg-config/pkgconf mess The packages are in conflict again, try to remove pkg-config this time and use pkgconf. --- .github/workflows/macos-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml index 24a9bc173..2bfea7f1b 100644 --- a/.github/workflows/macos-ci.yml +++ b/.github/workflows/macos-ci.yml @@ -24,7 +24,7 @@ jobs: run: | export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_INSTALL_CLEANUP=1 - brew unlink pkg-config || true + brew rm -f pkg-config@0.29.2 brew install \ cairo \ freetype \ @@ -34,9 +34,7 @@ jobs: icu4c \ meson \ ninja \ - pkg-config - brew unlink pkgconf || true - brew link pkg-config || true + pkgconf - name: Setup Python uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: