Merge pull request #29178 from meeseeksmachine/auto-backport-of-pr-29163-on-v3.9.x

QuLogic · web-flow · commit 84f2ae2ec8c4 · 2024-11-23T02:06:10.000-05:00
Backport PR #29163 on branch v3.9.x (ci: Remove outdated pkg-config package on macOS)
diff --git 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
@@ -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
