[3.13] gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (GH-145099) (GH...

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: clintonsteiner <47841949+clintonsteiner@users.noreply.github.com>

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index eacfff24889021baa35443be9db9ee3ce609327e..3004466b80e91c110c50a9fc643070cc843c71d4 100644 (file)
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -1,3 +1,8 @@
+self-hosted-runner:
+  # Pending release of actionlint > 1.7.11 for macos-26-intel support
+  # https://github.com/rhysd/actionlint/pull/629
+  labels: ["macos-26-intel"]
+
 config-variables: null
 
 paths:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ec0c8967ef58ebeb8052b30bba694f9925823f6..a95a1f233c4af0bdf7318f83046981c546053c51 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -246,16 +246,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # macos-14 is M1, macos-15-intel is Intel.
-        # macos-15-intel only runs tests against the GIL-enabled CPython.
+        # macos-26 is Apple Silicon, macos-26-intel is Intel.
+        # macos-26-intel only runs tests against the GIL-enabled CPython.
         os:
-        - macos-14
-        - macos-15-intel
+        - macos-26
+        - macos-26-intel
         free-threading:
         - false
         - true
         exclude:
-        - os: macos-15-intel
+        - os: macos-26-intel
           free-threading: true
     uses: ./.github/workflows/reusable-macos.yml
     with:
@@ -341,7 +341,7 @@ jobs:
       matrix:
         include:
           - arch: aarch64
-            runs-on: macos-14
+            runs-on: macos-26
           - arch: x86_64
             runs-on: ubuntu-24.04
 

diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
index 70b74ce5c7f5a4cc11abc62d056e4a04ad595b87..ffd49ca2834ee4195b33c8558e7394f96d67b565 100644 (file)
--- a/.github/workflows/jit.yml
+++ b/.github/workflows/jit.yml
@@ -82,11 +82,11 @@ jobs:
             compiler: msvc
           - target: x86_64-apple-darwin/clang
             architecture: x86_64
-            runner: macos-15-intel
+            runner: macos-26-intel
             compiler: clang
           - target: aarch64-apple-darwin/clang
             architecture: aarch64
-            runner: macos-14
+            runner: macos-26
             compiler: clang
           - target: x86_64-unknown-linux-gnu/gcc
             architecture: x86_64
@@ -133,8 +133,8 @@ jobs:
         run: |
           brew update
           brew install llvm@${{ matrix.llvm }}
-          SDKROOT="$(xcrun --show-sdk-path)" \
-            ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
+          export SDKROOT="$(xcrun --show-sdk-path)"
+          ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
           make all --jobs 4
           ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3