Skip to content

Commit ce78904

Browse files
[3.14] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (#146412)
Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
1 parent 498559a commit ce78904

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

.github/actionlint.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
self-hosted-runner:
2+
# Pending release of actionlint > 1.7.11 for macos-26-intel support
3+
# https://github.com/rhysd/actionlint/pull/629
4+
labels: ["macos-26-intel"]
5+
16
config-variables: null
27

38
paths:

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,16 @@ jobs:
240240
strategy:
241241
fail-fast: false
242242
matrix:
243-
# macos-14 is M1, macos-15-intel is Intel.
244-
# macos-15-intel only runs tests against the GIL-enabled CPython.
243+
# macos-26 is Apple Silicon, macos-26-intel is Intel.
244+
# macos-26-intel only runs tests against the GIL-enabled CPython.
245245
os:
246-
- macos-14
247-
- macos-15-intel
246+
- macos-26
247+
- macos-26-intel
248248
free-threading:
249249
- false
250250
- true
251251
exclude:
252-
- os: macos-15-intel
252+
- os: macos-26-intel
253253
free-threading: true
254254
uses: ./.github/workflows/reusable-macos.yml
255255
with:
@@ -369,7 +369,7 @@ jobs:
369369
matrix:
370370
include:
371371
- arch: aarch64
372-
runs-on: macos-14
372+
runs-on: macos-26
373373
- arch: x86_64
374374
runs-on: ubuntu-24.04
375375

.github/workflows/jit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ jobs:
9696
- false
9797
include:
9898
- target: x86_64-apple-darwin/clang
99-
runner: macos-15-intel
99+
runner: macos-26-intel
100100
- target: aarch64-apple-darwin/clang
101-
runner: macos-14
101+
runner: macos-26
102102
steps:
103103
- uses: actions/checkout@v6
104104
with:

.github/workflows/reusable-macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ jobs:
5252
--prefix=/opt/python-dev \
5353
--with-openssl="$(brew --prefix openssl@3.0)"
5454
- name: Build CPython
55-
if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
55+
if : ${{ inputs.free-threading || inputs.os != 'macos-26-intel' }}
5656
run: gmake -j8
5757
- name: Build CPython for compiler warning check
58-
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
58+
if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
5959
run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
6060
- name: Display build info
6161
run: make pythoninfo
6262
- name: Check compiler warnings
63-
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
63+
if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
6464
run: >-
6565
python3 Tools/build/check_warnings.py
6666
--compiler-output-file-path=compiler_output_macos.txt

.github/workflows/tail-call.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ jobs:
6666
matrix:
6767
include:
6868
- target: x86_64-apple-darwin/clang
69-
runner: macos-15-intel
69+
runner: macos-26-intel
7070
- target: aarch64-apple-darwin/clang
71-
runner: macos-14
71+
runner: macos-26
7272
steps:
7373
- uses: actions/checkout@v6
7474
with:

0 commit comments

Comments
 (0)