https://github.com/python/cpython/commit/94eee7875969a2f57238283d5b078bdc316fc7eb commit: 94eee7875969a2f57238283d5b078bdc316fc7eb branch: 3.12 author: Łukasz Langa <[email protected]> committer: ambv <[email protected]> date: 2024-06-06T14:30:20+02:00 summary:
[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 <[email protected]> Co-authored-by: Hugo van Kemenade <[email protected]> files: M .github/workflows/build.yml M .github/workflows/reusable-macos.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18e3de3d8ebd6f..76ff0e438d7ab0 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 fe16ad6d4b6e40..9c197aa732fcc5 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 _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
