]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-145098: Run Apple Silicon macOS CI on macos-26 (Tahoe) (#145099)
authorclintonsteiner <47841949+clintonsteiner@users.noreply.github.com>
Wed, 25 Mar 2026 11:15:46 +0000 (06:15 -0500)
committerGitHub <noreply@github.com>
Wed, 25 Mar 2026 11:15:46 +0000 (13:15 +0200)
.github/actionlint.yaml
.github/workflows/build.yml
.github/workflows/jit.yml
.github/workflows/reusable-macos.yml
.github/workflows/tail-call.yml

index eacfff24889021baa35443be9db9ee3ce609327e..3004466b80e91c110c50a9fc643070cc843c71d4 100644 (file)
@@ -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:
index a3898aad4e19117233dbf4ff377e95fed9970a25..3a6d6a763f2c9c9598016c03fb3d9c1119e7fab4 100644 (file)
@@ -198,16 +198,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:
@@ -336,7 +336,7 @@ jobs:
       matrix:
         include:
           - arch: aarch64
-            runs-on: macos-14
+            runs-on: macos-26
           - arch: x86_64
             runs-on: ubuntu-24.04
 
index da9c75ec75391a47d67e5ec94ff9c87c319628e1..1a3fcb3637e2ae7f9b717dadcf9671a4fee1e6ba 100644 (file)
@@ -99,9 +99,9 @@ jobs:
           - false
         include:
           - target: x86_64-apple-darwin/clang
-            runner: macos-15-intel
+            runner: macos-26-intel
           - target: aarch64-apple-darwin/clang
-            runner: macos-14
+            runner: macos-26
     steps:
       - uses: actions/checkout@v6
         with:
index 6afbf6595d93e3e0ea0a32d9313c511732eef195..a96aab1be1df491a3e43cca163fba4d7e7da2bed 100644 (file)
@@ -52,15 +52,15 @@ jobs:
           --prefix=/opt/python-dev \
           --with-openssl="$(brew --prefix openssl@3.5)"
     - name: Build CPython
-      if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
+      if : ${{ inputs.free-threading || inputs.os != 'macos-26-intel' }}
       run: gmake -j8
     - name: Build CPython for compiler warning check
-      if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
+      if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
       run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
     - name: Display build info
       run: make pythoninfo
     - name: Check compiler warnings
-      if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
+      if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
       run: >-
         python3 Tools/build/check_warnings.py
         --compiler-output-file-path=compiler_output_macos.txt
index 32c6aa75e479f83d74ab3259694924d2c15cf9a8..88833ea3bb202247b17c14792a11d9df3ae8396f 100644 (file)
@@ -67,9 +67,9 @@ jobs:
       matrix:
         include:
           - target: x86_64-apple-darwin/clang
-            runner: macos-15-intel
+            runner: macos-26-intel
           - target: aarch64-apple-darwin/clang
-            runner: macos-14
+            runner: macos-26
     steps:
       - uses: actions/checkout@v6
         with: