Skip to content

Commit 195b1de

Browse files
[3.14] gh-145098: Use macos-26-intel instead of macos-15-intel (GH-149991) (#153181)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent 07bfd55 commit 195b1de

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
@@ -240,16 +240,16 @@ jobs:
240240
strategy:
241241
fail-fast: false
242242
matrix:
243-
# macos-26 is Apple Silicon, macos-15-intel is Intel.
244-
# macos-15-intel only runs tests against the GIL-enabled CPython.
243+
# macos-26 is Apple Silicon, macos-26-intel is Intel.
244+
# macos-26-intel only runs tests against the GIL-enabled CPython.
245245
os:
246246
- macos-26
247-
- macos-15-intel
247+
- macos-26-intel
248248
free-threading:
249249
- false
250250
- true
251251
exclude:
252-
- os: macos-15-intel
252+
- os: macos-26-intel
253253
free-threading: true
254254
uses: ./.github/workflows/reusable-macos.yml
255255
with:

.github/workflows/reusable-macos.yml

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

0 commit comments

Comments
 (0)