mirror of
https://github.com/python/cpython
synced 2024-10-06 14:39:37 +00:00
[3.12] gh-120111: Don't use cirrus M1 macOS runners on fork (GH-120116) (GH-120153)
(cherry picked from commit fd104dfcb8
)
Co-authored-by: Nice Zombies <nineteendo19d0@gmail.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
This commit is contained in:
parent
c5d1fbd4ce
commit
94eee78759
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
|
@ -228,8 +228,9 @@ jobs:
|
||||||
uses: ./.github/workflows/reusable-macos.yml
|
uses: ./.github/workflows/reusable-macos.yml
|
||||||
with:
|
with:
|
||||||
config_hash: ${{ needs.check_source.outputs.config_hash }}
|
config_hash: ${{ needs.check_source.outputs.config_hash }}
|
||||||
# Cirrus is M1, macos-13 is default GHA Intel
|
# Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
|
||||||
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
|
# Cirrus used for upstream, macos-14 for forks.
|
||||||
|
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14", "macos-13"]'
|
||||||
|
|
||||||
build_ubuntu:
|
build_ubuntu:
|
||||||
name: 'Ubuntu'
|
name: 'Ubuntu'
|
||||||
|
|
9
.github/workflows/reusable-macos.yml
vendored
9
.github/workflows/reusable-macos.yml
vendored
|
@ -14,7 +14,7 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_macos:
|
build_macos:
|
||||||
name: 'build and test'
|
name: build and test (${{ matrix.os }})
|
||||||
timeout-minutes: 60
|
timeout-minutes: 60
|
||||||
env:
|
env:
|
||||||
HOMEBREW_NO_ANALYTICS: 1
|
HOMEBREW_NO_ANALYTICS: 1
|
||||||
|
@ -26,6 +26,13 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: ${{fromJson(inputs.os-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 }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
Loading…
Reference in a new issue