8000 gh-120111: Don't use cirrus M1 macOS runners on fork by nineteendo · Pull Request #120116 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-120111: Don't use cirrus M1 macOS runners on fork #120116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 6, 2024
Merged

gh-120111: Don't use cirrus M1 macOS runners on fork #120116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d22ab43
Update reusable-macos.yml
nineteendo Jun 5, 2024
d3da0ce
Skip attempt 2
nineteendo Jun 5, 2024
a38b730
Attempt 3
nineteendo Jun 5, 2024
c3e96e4
Attempt 4
nineteendo Jun 5, 2024
30ab84c
Attempt 5
nineteendo Jun 5, 2024
f52acc0
Add macOS-14 to matrix
nineteendo Jun 5, 2024
a36acd5
Only run macOS-14 on fork
nineteendo Jun 5, 2024
f64cce4
Merge branch 'main' into skip-cirrus-mac-runners
nineteendo Jun 5, 2024
2963ce2
Update job name
nineteendo Jun 5, 2024
2e37c7e
Apply suggestions from code review
nineteendo Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand All @@ -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:
8000 name: 'Ubuntu'
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/reusable-macos.yml
View file
Open in desktop
4CCF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading
0