Skip to content

Commit 5270a2c

Browse files
authored
Merge pull request matplotlib#28989 from QuLogic/auto-backport-of-pr-28972-on-v3.9.x
Backport PR matplotlib#28972 on branch v3.9.x (Switch macOS 12 runner images to macOS 13)
2 parents 97ea6ef + c2116de commit 5270a2c

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
cibw_archs: "aarch64"
125125
- os: windows-latest
126126
cibw_archs: "auto64"
127-
- os: macos-12
127+
- os: macos-13
128128
cibw_archs: "x86_64"
129129
- os: macos-14
130130
cibw_archs: "arm64"

.github/workflows/tests.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
pyqt6-ver: '!=6.6.0'
102102
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
103103
pyside6-ver: '!=6.5.1'
104-
- os: macos-12 # This runner is on Intel chips.
104+
- os: macos-13 # This runner is on Intel chips.
105105
python-version: '3.9'
106106
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
107107
pyside6-ver: '!=6.5.1'
@@ -192,6 +192,17 @@ jobs:
192192
;;
193193
macOS)
194194
brew update
195+
# Periodically, Homebrew updates Python and fails to overwrite the
196+
# existing not-managed-by-Homebrew copy without explicitly being told
197+
# to do so. GitHub/Azure continues to avoid fixing their runner images:
198+
# https://github.com/actions/runner-images/issues/9966
199+
# so force an overwrite even if there are no Python updates.
200+
# We don't even care about Homebrew's Python because we use the one
201+
# from actions/setup-python.
202+
for python_package in $(brew list | grep python@); do
203+
brew unlink ${python_package}
204+
brew link --overwrite ${python_package}
205+
done
195206
brew install ccache ghostscript gobject-introspection gtk4 ninja
196207
brew install --cask font-noto-sans-cjk inkscape
197208
;;

azure-pipelines.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,17 @@ stages:
120120
;;
121121
Darwin)
122122
brew update
123+
# Periodically, Homebrew updates Python and fails to overwrite the
124+
# existing not-managed-by-Homebrew copy without explicitly being told
125+
# to do so. GitHub/Azure continues to avoid fixing their runner images:
126+
# https://github.com/actions/runner-images/issues/9966
127+
# so force an overwrite even if there are no Python updates.
128+
# We don't even care about Homebrew's Python because we use the one
129+
# from UsePythonVersion.
130+
for python_package in $(brew list | grep python@); do
131+
brew unlink ${python_package}
132+
brew link --overwrite ${python_package}
133+
done
123134
brew install --cask xquartz
124135
brew install ccache ffmpeg imagemagick mplayer ninja pkg-config
125136
brew install --cask font-noto-sans-cjk-sc

0 commit comments

Comments
 (0)