diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-06-06 12:26:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 12:26:23 (GMT) |
| commit | 13e5f455c45d21a3642aaf429cf20cac71dbf29b (patch) | |
| tree | 88190617bf03ed0bf85407f8909cd425db0ccd77 | |
| parent | 3a84779806897ec228417242fd9417363cb6e827 (diff) | |
| download | cpython-13e5f455c45d21a3642aaf429cf20cac71dbf29b.zip cpython-13e5f455c45d21a3642aaf429cf20cac71dbf29b.tar.gz cpython-13e5f455c45d21a3642aaf429cf20cac71dbf29b.tar.bz2 | |
[3.13] gh-120111: Don't use cirrus M1 macOS runners on fork (GH-120116) (GH-120152)
(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>
| -rw-r--r-- | .github/workflows/build.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/reusable-macos.yml | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57c58d7..04020de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -199,8 +199,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_macos_free_threading: name: 'macOS (free-threading)' @@ -210,8 +211,9 @@ jobs: with: config_hash: ${{ needs.check_source.outputs.config_hash }} free-threading: true - # Cirrus is M1 - os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]' + # Cirrus and macos-14 are M1. + # Cirrus used for upstream, macos-14 for forks. + os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14"]' build_ubuntu: name: 'Ubuntu' diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml index d06a718..f825d1a 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 @@ -27,6 +27,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 |