]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-145098: Use `macos-15-intel` instead of unstable `macos-26-intel` (#148038)
authorHugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Fri, 3 Apr 2026 16:23:29 +0000 (19:23 +0300)
committerGitHub <noreply@github.com>
Fri, 3 Apr 2026 16:23:29 +0000 (19:23 +0300)
.github/workflows/build.yml
.github/workflows/reusable-macos.yml

index 025032a3ae68c4fed0325f09ad1eafa59e7caf2e..a80262e3c0243c390950759f12a3b382bc016eff 100644 (file)
@@ -206,16 +206,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:
index 9d8e6b03464ee343997d328baa45ff5d3de5be71..785dcc77f542273f9a679308e4a71a37668a19c3 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-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