Skip to content

Remove Cirrus macOS runners from CI #139799

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 4 commits into from
Oct 8, 2025
Merged

Remove Cirrus macOS runners from CI #139799

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f25241f
infra: migrate away from cirrus
JacobCoffee Oct 8, 2025
4da358b
infra: no cirrus also on android (?)
JacobCoffee Oct 8, 2025
1f83dec
Update .github/workflows/build.yml
JacobCoffee Oct 8, 2025
9c52be1
Update .github/workflows/build.yml
JacobCoffee Oct 8, 2025
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
16 changes: 4 additions & 12 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,16 @@ jobs:
strategy:
fail-fast: false
matrix:
# Cirrus and macos-14 are M1, macos-15-intel is default GHA Intel.
# macOS 13 only runs tests against the GIL-enabled CPython.
# Cirrus used for upstream, macos-14 for forks.
# macos-14 is M1, macos-15-intel is default GHA Intel.
# macos-15-intel only runs tests against the GIL-enabled CPython.
# macos-14 is for forks.
os:
- ghcr.io/cirruslabs/macos-runner:sonoma
- macos-14
- macos-15-intel
is-fork: # only used for the exclusion trick
- ${{ github.repository_owner != 'python' }}
free-threading:
- false
- true
exclude:
- os: ghcr.io/cirruslabs/macos-runner:sonoma
is-fork: true
- os: macos-14
is-fork: false
- os: macos-15-intel
free-threading: true
uses: ./.github/workflows/reusable-macos.yml
Expand Down Expand Up @@ -409,9 +402,8 @@ jobs:
fail-fast: false
matrix:
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

@JacobCoffee JacobCoffee Oct 8, 2025

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

@hugovk hugovk Oct 8, 2025

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.

runs-on: macos-14
- arch: x86_64
runs-on: ubuntu-24.04

Expand Down
Loading