mirror of
https://github.com/python/cpython.git
synced 2026-07-08 03:00:00 -04:00
[3.15] gh-145098: Use macos-26-intel instead of macos-15-intel (GH-149991) (#153179)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
8e7c2ca7a0
commit
52810f997a
@@ -253,16 +253,16 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
# macos-26 is Apple Silicon, 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-26
|
||||
- macos-15-intel
|
||||
- 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:
|
||||
|
||||
@@ -54,15 +54,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
|
||||
|
||||
Reference in New Issue
Block a user