Skip to content

Backport PR #28972 on branch v3.9.x (Switch macOS 12 runner images to macOS 13) #28989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Backport PR #28972 on branch v3.9.x (Switch macOS 12 runner images to macOS 13) #28989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cibuildwheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
cibw_archs: "aarch64"
- os: windows-latest
cibw_archs: "auto64"
- os: macos-12
- os: macos-13
cibw_archs: "x86_64"
- os: macos-14
cibw_archs: "arm64"
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
pyqt6-ver: '!=6.6.0'
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
pyside6-ver: '!=6.5.1'
- os: macos-12 # This runner is on Intel chips.
- os: macos-13 # This runner is on Intel chips.
python-version: '3.9'
# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
pyside6-ver: '!=6.5.1'
Expand Down Expand Up @@ -192,6 +192,17 @@ jobs:
;;
macOS)
brew update
# Periodically, Homebrew updates Python and fails to overwrite the
# existing not-managed-by-Homebrew copy without explicitly being told
# to do so. GitHub/Azure continues to avoid fixing their runner images:
# https://github.com/actions/runner-images/issues/9966
# so force an overwrite even if there are no Python updates.
# We don't even care about Homebrew's Python because we use the one
# from actions/setup-python.
for python_package in $(brew list | grep python@); do
brew unlink ${python_package}
brew link --overwrite ${python_package}
done
brew install ccache ghostscript gobject-introspection gtk4 ninja
brew install --cask font-noto-sans-cjk inkscape
;;
Expand Down
11 changes: 11 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,17 @@ stages:
;;
Darwin)
brew update
# Periodically, Homebrew updates Python and fails to overwrite the
# existing not-managed-by-Homebrew copy without explicitly being told
# to do so. GitHub/Azure continues to avoid fixing their runner images:
# https://github.com/actions/runner-images/issues/9966
# so force an overwrite even if there are no Python updates.
# We don't even care about Homebrew's Python because we use the one
# from UsePythonVersion.
for python_package in $(brew list | grep python@); do
brew unlink ${python_package}
brew link --overwrite ${python_package}
done
brew install --cask xquartz
brew install ccache ffmpeg imagemagick mplayer ninja pkg-config
brew install --cask font-noto-sans-cjk-sc
Expand Down
Loading