Skip to content

Conversation

JacobCoffee
Copy link
Member

A continuation of #134390

include:
# Use the same runs-on configuration as build-macos and build-ubuntu.
- arch: aarch64
runs-on: ${{ github.repository_owner == 'python' && 'ghcr.io/cirruslabs/macos-runner:sonoma' || 'macos-14' }}
Copy link
Member Author

Choose a reason for hiding this comment

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

pls review

Copy link
Member

Choose a reason for hiding this comment

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

Yes, this is correct.

Before, this was essentially a YAML ternary.

It was checking if the CI was running under the python org, and if so, would use the Cirrus runners.

If not, the CI is running on someone's fork, where they don't have access to Cirrus, so would fall back to macos-14.

But now, we want to use macos-14 for everyone.

@StanFromIreland StanFromIreland added the infra CI, GitHub Actions, buildbots, Dependabot, etc. label Oct 8, 2025
Copy link
Member

@hugovk hugovk left a comment

Choose a reason for hiding this comment

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

Thanks, just some comments cleanup.

include:
# Use the same runs-on configuration as build-macos and build-ubuntu.
- arch: aarch64
runs-on: ${{ github.repository_owner == 'python' && 'ghcr.io/cirruslabs/macos-runner:sonoma' || 'macos-14' }}
Copy link
Member

Choose a reason for hiding this comment

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

Yes, this is correct.

Before, this was essentially a YAML ternary.

It was checking if the CI was running under the python org, and if so, would use the Cirrus runners.

If not, the CI is running on someone's fork, where they don't have access to Cirrus, so would fall back to macos-14.

But now, we want to use macos-14 for everyone.

JacobCoffee and others added 2 commits October 8, 2025 13:47
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@hugovk
Copy link
Member

hugovk commented Oct 8, 2025

Some extra background for this.

The 3.14 branch had been locked during the RC. Yesterday, 3.14.0 was released and I unlocked the branch. About 120 PRs were merged in a short period of time, and over 250 GitHub Actions builds were ran within the resulting spike:

image

The slowest of these took just under six hours:

image

Looking at the slowest:

image

We can see most of the jobs finished within 25 minutes. These are all on GitHub Actions. But the two Cirrus jobs waited for 5h 49m until a runner was available, before completing in around 4 minutes each. In contast, the GHA macos-15-intel job started quite quickly.

There's not too much difference in a 4 minute Cirrus job vs a 6 minute GHA job, especially if you have to wait a long time for a runner. And in normal times, the whole build is about 25 mins anyway. We have 50 parallel runners available on GHA. I don't know the actual number on Cirrus, but it's much lower.

So let's just use the GHA runners. This will also help for sprints (for example, PyCon US during #134390).

Thanks to Datadog for these visualisations!

@hugovk hugovk added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Oct 8, 2025
@hugovk hugovk enabled auto-merge (squash) October 8, 2025 19:01
@hugovk hugovk merged commit 6954077 into python:main Oct 8, 2025
49 checks passed
@miss-islington-app
Copy link

Thanks @JacobCoffee for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13, 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 8, 2025
(cherry picked from commit 6954077)

Co-authored-by: Jacob Coffee <jacob@z7x.org>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 8, 2025
(cherry picked from commit 6954077)

Co-authored-by: Jacob Coffee <jacob@z7x.org>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 8, 2025

GH-139802 is a backport of this pull request to the 3.14 branch.

@miss-islington-app
Copy link

Sorry, @JacobCoffee and @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 6954077fde4aee07b55a666a610ef4bc4b9d76a8 3.12

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Oct 8, 2025
@bedevere-app
Copy link

bedevere-app bot commented Oct 8, 2025

GH-139803 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Oct 8, 2025
JacobCoffee added a commit to JacobCoffee/cpython that referenced this pull request Oct 8, 2025
(cherry picked from commit 6954077)

Co-authored-by: Jacob Coffee <jacob@z7x.org>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 8, 2025

GH-139804 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Oct 8, 2025
@JacobCoffee JacobCoffee deleted the no-cirrus branch October 8, 2025 19:20
hugovk added a commit that referenced this pull request Oct 8, 2025
Co-authored-by: Jacob Coffee <jacob@z7x.org>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
hugovk added a commit that referenced this pull request Oct 8, 2025
Co-authored-by: Jacob Coffee <jacob@z7x.org>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
hugovk added a commit that referenced this pull request Oct 8, 2025
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

infra CI, GitHub Actions, buildbots, Dependabot, etc. skip issue skip news

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants