https://github.com/python/cpython/commit/13e5f455c45d21a3642aaf429cf20cac71dbf29b
commit: 13e5f455c45d21a3642aaf429cf20cac71dbf29b
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: ambv <luk...@langa.pl>
date: 2024-06-06T14:26:23+02:00
summary:
[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 <nineteendo1...@gmail.com>
Co-authored-by: Hugo van Kemenade <1324225+hug...@users.noreply.github.com>
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 57c58d7ff1d6d8..04020de7c950c1 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 d06a718d199c96..f825d1a7b3f69a 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
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
