From 2007db0a44b884e442b1177f75bc104b35b87172 Mon Sep 17 00:00:00 2001 From: "Lumberbot (aka Jack)" <39504233+meeseeksmachine@users.noreply.github.com> Date: Thu, 21 Nov 2024 11:51:21 -0800 Subject: [PATCH] Backport PR #29163: ci: Remove outdated pkg-config package on macOS (#29164) Co-authored-by: Elliott Sales de Andrade --- .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 f73fde457be3..72342af171c8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -199,6 +199,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 4bccb5da8ed2..0c891fe42fef 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -122,6 +122,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