From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 3 Apr 2026 16:23:29 +0000 (+0300) Subject: gh-145098: Use `macos-15-intel` instead of unstable `macos-26-intel` (#148038) X-Git-Tag: v3.15.0a8~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb76ab3819f778e55a3f49ddb1f681ee20978eda;p=thirdparty%2FPython%2Fcpython.git gh-145098: Use `macos-15-intel` instead of unstable `macos-26-intel` (#148038) --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 025032a3ae68..a80262e3c024 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml index 9d8e6b03464e..785dcc77f542 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.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