From f25241ff141986c05b848323968997f3d678febc Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Wed, 8 Oct 2025 12:02:09 -0500 Subject: [PATCH 1/4] infra: migrate away from cirrus --- .github/workflows/build.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 252ec831ed91dd..145586476e3f2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 4da358b95933f0441787bffab286bdbe2e4d3f79 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Wed, 8 Oct 2025 12:02:25 -0500 Subject: [PATCH 2/4] infra: no cirrus also on android (?) --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 145586476e3f2d..a1054eba26b149 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -402,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' }} + runs-on: macos-14 - arch: x86_64 runs-on: ubuntu-24.04 From 1f83dec66936142a29a261d4a834248090685220 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Wed, 8 Oct 2025 13:47:02 -0500 Subject: [PATCH 3/4] Update .github/workflows/build.yml Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1054eba26b149..3487b078d5064a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,7 +204,6 @@ jobs: matrix: # 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: - macos-14 - macos-15-intel From 9c52be136341cbe2fcce80634e0bdddaf0e48371 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Wed, 8 Oct 2025 13:47:19 -0500 Subject: [PATCH 4/4] Update .github/workflows/build.yml Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3487b078d5064a..625466151e34de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -202,7 +202,7 @@ jobs: strategy: fail-fast: false matrix: - # macos-14 is M1, macos-15-intel is default GHA Intel. + # macos-14 is M1, macos-15-intel is Intel. # macos-15-intel only runs tests against the GIL-enabled CPython. os: - macos-14