Skip to content

Commit 0dcb625

Browse files
hugovkmiss-islingtonclintonsteiner
authored
[3.13] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (GH-146412) (#146414)
Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
1 parent 472f1af commit 0dcb625

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
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
@@ -246,16 +246,16 @@ jobs:
246246
strategy:
247247
fail-fast: false
248248
matrix:
249-
# macos-14 is M1, macos-15-intel is Intel.
250-
# macos-15-intel only runs tests against the GIL-enabled CPython.
249+
# macos-26 is Apple Silicon, macos-26-intel is Intel.
250+
# macos-26-intel only runs tests against the GIL-enabled CPython.
251251
os:
252-
- macos-14
253-
- macos-15-intel
252+
- macos-26
253+
- macos-26-intel
254254
free-threading:
255255
- false
256256
- true
257257
exclude:
258-
- os: macos-15-intel
258+
- os: macos-26-intel
259259
free-threading: true
260260
uses: ./.github/workflows/reusable-macos.yml
261261
with:
@@ -341,7 +341,7 @@ jobs:
341341
matrix:
342342
include:
343343
- arch: aarch64
344-
runs-on: macos-14
344+
runs-on: macos-26
345345
- arch: x86_64
346346
runs-on: ubuntu-24.04
347347

.github/workflows/jit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ jobs:
8282
compiler: msvc
8383
- target: x86_64-apple-darwin/clang
8484
architecture: x86_64
85-
runner: macos-15-intel
85+
runner: macos-26-intel
8686
compiler: clang
8787
- target: aarch64-apple-darwin/clang
8888
architecture: aarch64
89-
runner: macos-14
89+
runner: macos-26
9090
compiler: clang
9191
- target: x86_64-unknown-linux-gnu/gcc
9292
architecture: x86_64
@@ -133,8 +133,8 @@ jobs:
133133
run: |
134134
brew update
135135
brew install llvm@${{ matrix.llvm }}
136-
SDKROOT="$(xcrun --show-sdk-path)" \
137-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
136+
export SDKROOT="$(xcrun --show-sdk-path)"
137+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
138138
make all --jobs 4
139139
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
140140

0 commit comments

Comments
 (0)