Skip to content

Commit 52810f9

Browse files
[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>
1 parent 8e7c2ca commit 52810f9

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,16 +253,16 @@ jobs:
253253
strategy:
254254
fail-fast: false
255255
matrix:
256-
# macos-26 is Apple Silicon, macos-15-intel is Intel.
257-
# macos-15-intel only runs tests against the GIL-enabled CPython.
256+
# macos-26 is Apple Silicon, macos-26-intel is Intel.
257+
# macos-26-intel only runs tests against the GIL-enabled CPython.
258258
os:
259259
- macos-26
260-
- macos-15-intel
260+
- macos-26-intel
261261
free-threading:
262262
- false
263263
- true
264264
exclude:
265-
- os: macos-15-intel
265+
- os: macos-26-intel
266266
free-threading: true
267267
uses: ./.github/workflows/reusable-macos.yml
268268
with:

.github/workflows/reusable-macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ jobs:
5454
--prefix=/opt/python-dev \
5555
--with-openssl="$(brew --prefix openssl@3.5)"
5656
- name: Build CPython
57-
if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
57+
if : ${{ inputs.free-threading || inputs.os != 'macos-26-intel' }}
5858
run: gmake -j8
5959
- name: Build CPython for compiler warning check
60-
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
60+
if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
6161
run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
6262
- name: Display build info
6363
run: make pythoninfo
6464
- name: Check compiler warnings
65-
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
65+
if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
6666
run: >-
6767
python3 Tools/build/check_warnings.py
6868
--compiler-output-file-path=compiler_output_macos.txt

0 commit comments

Comments
 (0)