From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 4 Apr 2026 10:02:44 +0000 (+0200)
Subject: [3.14] gh-145098: Use `macos-15-intel` instead of unstable `macos-26-intel` (GH-14803... 
X-Git-Tag: v3.14.4~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58756bf0db0804403f526d71c6bf8153e58ef887;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-145098: Use `macos-15-intel` instead of unstable `macos-26-intel` (GH-148038) (#148076)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d88a4f1b0b75..d493ab802de8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -240,16 +240,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # macos-26 is Apple Silicon, macos-26-intel is Intel.
-        # macos-26-intel only runs tests against the GIL-enabled CPython.
+        # macos-26 is Apple Silicon, macos-15-intel is Intel.
+        # macos-15-intel only runs tests against the GIL-enabled CPython.
         os:
         - macos-26
-        - macos-26-intel
+        - macos-15-intel
         free-threading:
         - false
         - true
         exclude:
-        - os: macos-26-intel
+        - os: macos-15-intel
           free-threading: true
     uses: ./.github/workflows/reusable-macos.yml
     with:
diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
index f2e12c6c8514..3dd03e1ba0f1 100644
--- a/.github/workflows/reusable-macos.yml
+++ b/.github/workflows/reusable-macos.yml
@@ -52,15 +52,15 @@ jobs:
           --prefix=/opt/python-dev \
           --with-openssl="$(brew --prefix openssl@3.0)"
     - name: Build CPython
-      if : ${{ inputs.free-threading || inputs.os != 'macos-26-intel' }}
+      if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
       run: gmake -j8
     - name: Build CPython for compiler warning check
-      if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
+      if : ${{ !inputs.free-threading && inputs.os == 'macos-15-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-26-intel' }}
+      if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
       run: >-
         python3 Tools/build/check_warnings.py
         --compiler-output-file-path=compiler_output_macos.txt