From dd5777232d288970697f4effafd38946d541784c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 20 Nov 2024 23:48:23 -0500 Subject: [PATCH] Backport PR #29163: ci: Remove outdated pkg-config package on macOS --- .github/workflows/tests.yml | 2 ++ azure-pipelines.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6d2fe41546f1..6f604db8cd0b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -202,6 +202,8 @@ jobs: brew unlink ${python_package} brew link --overwrite ${python_package} done + # Workaround for https://github.com/actions/runner-images/issues/10984 + brew uninstall --ignore-dependencies --force pkg-config@0.29.2 brew install ccache ghostscript gobject-introspection gtk4 ninja brew install --cask font-noto-sans-cjk inkscape ;; diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e2829ce81e9f..00edc8e9a412 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -131,6 +131,8 @@ stages: brew unlink ${python_package} brew link --overwrite ${python_package} done + # Workaround for https://github.com/actions/runner-images/issues/10984 + brew uninstall --ignore-dependencies --force pkg-config@0.29.2 brew install --cask xquartz brew install ccache ffmpeg imagemagick mplayer ninja pkg-config brew install --cask font-noto-sans-cjk-sc