Skip to content

Commit 94eee78

Browse files
ambvnineteendohugovk
authored
[3.12] gh-120111: Don't use cirrus M1 macOS runners on fork (GH-120116) (GH-120153)
(cherry picked from commit fd104df) Co-authored-by: Nice Zombies <[email protected]> Co-authored-by: Hugo van Kemenade <[email protected]>
1 parent c5d1fbd commit 94eee78

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,9 @@ jobs:
228228
uses: ./.github/workflows/reusable-macos.yml
229229
with:
230230
config_hash: ${{ needs.check_source.outputs.config_hash }}
231-
# Cirrus is M1, macos-13 is default GHA Intel
232-
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
231+
# Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
232+
# Cirrus used for upstream, macos-14 for forks.
233+
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14", "macos-13"]'
233234

234235
build_ubuntu:
235236
name: 'Ubuntu'

.github/workflows/reusable-macos.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
build_macos:
17-
name: 'build and test'
17+
name: build and test (${{ matrix.os }})
1818
timeout-minutes: 60
1919
env:
2020
HOMEBREW_NO_ANALYTICS: 1
@@ -26,6 +26,13 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: ${{fromJson(inputs.os-matrix)}}
29+
is-fork:
30+
- ${{ github.repository_owner != 'python' }}
31+
exclude:
32+
- os: "ghcr.io/cirruslabs/macos-runner:sonoma"
33+
is-fork: true
34+
- os: "macos-14"
35+
is-fork: false
2936
runs-on: ${{ matrix.os }}
3037
steps:
3138
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)