From: Łukasz Langa <lukasz@langa.pl>
Date: Thu, 6 Jun 2024 12:30:20 +0000 (-0400)
Subject: [3.12] gh-120111: Don't use cirrus M1 macOS runners on fork (GH-120116) (GH-120153)
X-Git-Tag: v3.12.4~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94eee7875969a2f57238283d5b078bdc316fc7eb;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-120111: Don't use cirrus M1 macOS runners on fork (GH-120116) (GH-120153)

(cherry picked from commit fd104dfcb838d735ef8128e3539d7a730d403422)

Co-authored-by: Nice Zombies <nineteendo19d0@gmail.com>
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 18e3de3d8ebd..76ff0e438d7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -228,8 +228,9 @@ jobs:
     uses: ./.github/workflows/reusable-macos.yml
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
-      # Cirrus is M1, macos-13 is default GHA Intel
-      os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
+      # Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
+      # Cirrus used for upstream, macos-14 for forks.
+      os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14", "macos-13"]'
 
   build_ubuntu:
     name: 'Ubuntu'
diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
index fe16ad6d4b6e..9c197aa732fc 100644
--- a/.github/workflows/reusable-macos.yml
+++ b/.github/workflows/reusable-macos.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build_macos:
-    name: 'build and test'
+    name: build and test (${{ matrix.os }})
     timeout-minutes: 60
     env:
       HOMEBREW_NO_ANALYTICS: 1
@@ -26,6 +26,13 @@ jobs:
       fail-fast: false
       matrix:
         os: ${{fromJson(inputs.os-matrix)}}
+        is-fork:
+          - ${{ github.repository_owner != 'python' }}
+        exclude:
+          - os: "ghcr.io/cirruslabs/macos-runner:sonoma"
+            is-fork: true
+          - os: "macos-14"
+            is-fork: false
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4