Commit84f2ae2

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 parentsd71ff49 +dd57772 commit84f2ae2Copy full SHA for 84f2ae2

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,8 @@ jobs:`
`202`	`202`	`brew unlink ${python_package}`
`203`	`203`	`brew link --overwrite ${python_package}`
`204`	`204`	`done`
	`205`	`+ # Workaround for https://github.com/actions/runner-images/issues/10984`
	`206`	`+ brew uninstall --ignore-dependencies --force pkg-config@0.29.2`
`205`	`207`	`brew install ccache ghostscript gobject-introspection gtk4 ninja`
`206`	`208`	`brew install --cask font-noto-sans-cjk inkscape`
`207`	`209`	`;;`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,8 @@ stages:`
`131`	`131`	`brew unlink ${python_package}`
`132`	`132`	`brew link --overwrite ${python_package}`
`133`	`133`	`done`
	`134`	`+ # Workaround for https://github.com/actions/runner-images/issues/10984`
	`135`	`+ brew uninstall --ignore-dependencies --force pkg-config@0.29.2`
`134`	`136`	`brew install --cask xquartz`
`135`	`137`	`brew install ccache ffmpeg imagemagick mplayer ninja pkg-config`
`136`	`138`	`brew install --cask font-noto-sans-cjk-sc`

Comments

(0)