Skip to content

Commit

Permalink
Merge pull request #29178 from meeseeksmachine/auto-backport-of-pr-29…
Browse files Browse the repository at this point in the history
…163-on-v3.9.x

Backport PR #29163 on branch v3.9.x (ci: Remove outdated pkg-config package on macOS)
  • Loading branch information
QuLogic authored Nov 23, 2024
2 parents d71ff49 + dd57772 commit 84f2ae2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
brew install ccache ghostscript gobject-introspection gtk4 ninja
brew install --cask font-noto-sans-cjk inkscape
;;
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
brew install --cask xquartz
brew install ccache ffmpeg imagemagick mplayer ninja pkg-config
brew install --cask font-noto-sans-cjk-sc
Expand Down

0 comments on commit 84f2ae2

Please sign in to comment.