From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 8 Oct 2025 19:38:52 +0000 (+0200)
Subject: [3.13] Remove Cirrus macOS runners from CI (GH-139799) (#139803)
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2072386e05ab0ae9245ab0ae056901b8040cddcd;p=thirdparty%2FPython%2Fcpython.git

[3.13] Remove Cirrus macOS runners from CI (GH-139799) (#139803)

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 19cefaf4d215..4afd4947c74a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -255,23 +255,15 @@ 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 Intel.
+        # macos-15-intel only runs tests against the GIL-enabled CPython.
         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
@@ -370,9 +362,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