Skip to content

Commit 84f2ae2

Browse files
authored
Merge pull request #29178 from meeseeksmachine/auto-backport-of-pr-29163-on-v3.9.x
Backport PR #29163 on branch v3.9.x (ci: Remove outdated pkg-config package on macOS)
2 parents d71ff49 + dd57772 commit 84f2ae2

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ jobs:
202202
brew unlink ${python_package}
203203
brew link --overwrite ${python_package}
204204
done
205+
# Workaround for https://github.com/actions/runner-images/issues/10984
206+
brew uninstall --ignore-dependencies --force pkg-config@0.29.2
205207
brew install ccache ghostscript gobject-introspection gtk4 ninja
206208
brew install --cask font-noto-sans-cjk inkscape
207209
;;

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ stages:
131131
brew unlink ${python_package}
132132
brew link --overwrite ${python_package}
133133
done
134+
# Workaround for https://github.com/actions/runner-images/issues/10984
135+
brew uninstall --ignore-dependencies --force pkg-config@0.29.2
134136
brew install --cask xquartz
135137
brew install ccache ffmpeg imagemagick mplayer ninja pkg-config
136138
brew install --cask font-noto-sans-cjk-sc

0 commit comments

Comments
 (0)