Skip to content

Switch macOS 12 runner images to macOS 13 #28972

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.

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 2 commits into from
Oct 17, 2024
Merged

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Oct 12, 2024

PR summary

These are going away soon, so let's see how this works out.

actions/runner-images#10721

This may be the last Intel macOS left now.

PR checklist

@github-actions github-actions bot added the CI: Run cibuildwheel Run wheel building tests on a PR label Oct 12, 2024
@QuLogic QuLogic added the CI: testing CI configuration and testing label Oct 12, 2024
@QuLogic
Copy link
Member Author

QuLogic commented Oct 12, 2024

Looks like even on macOS 13, the Homebrew Python installation is still broken.

if [[ "${{ matrix.os }}" = macos-14 ]]; then
brew install gobject-introspection gtk4
fi
brew install ccache ghostscript gobject-introspection gtk4 ninja
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
brew install ccache ghostscript gobject-introspection gtk4 ninja
brew install ccache ghostscript ninja

will this skip the Python update?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right, maybe I'll put the condition back in.

These are going away soon, so let's see how this works out.

actions/runner-images#10721
@QuLogic QuLogic force-pushed the ci-macos13 branch 2 times, most recently from aa27cb5 to 3fd066a Compare October 17, 2024 00:38
We don't care about system Python, as we use `actions/setup-python` (on
GitHub) or `UsePythonVersion` (on Azure), which install in some other
location and adjust the `PATH`. But occasionally, Homebrew will fail to
update these files because they didn't come from Homebrew, so just
silence its complaints.
@QuLogic
Copy link
Member Author

QuLogic commented Oct 17, 2024

I've given up hoping that actions/runner-images#9966 will ever be fixed properly. So instead, implemented some forced linking that I found in related discussion.

@QuLogic QuLogic marked this pull request as ready for review October 17, 2024 01:15
@QuLogic QuLogic added this to the v3.9.3 milestone Oct 17, 2024
@ksunden ksunden merged commit fd452d2 into matplotlib:main Oct 17, 2024
46 of 47 checks passed
Copy link

lumberbot-app bot commented Oct 17, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.9.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 fd452d20bc4dd2eac6b028461e9c92adbbdcda1f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #28972: Switch macOS 12 runner images to macOS 13'
  1. Push to a named branch:
git push YOURFORK v3.9.x:auto-backport-of-pr-28972-on-v3.9.x
  1. Create a PR against branch v3.9.x, I would have named this PR:

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

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@QuLogic QuLogic deleted the ci-macos13 branch October 17, 2024 19:13
QuLogic added a commit to QuLogic/matplotlib that referenced this pull request Oct 17, 2024
QuLogic added a commit that referenced this pull request Oct 18, 2024
…3.9.x

Backport PR #28972 on branch v3.9.x (Switch macOS 12 runner images to macOS 13)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Run cibuildwheel Run wheel building tests on a PR CI: testing CI configuration and testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants