Skip to content

Commit 58756bf

Browse files
[3.14] gh-145098: Use macos-15-intel instead of unstable macos-26-intel (GH-148038) (#148076)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent 1c3e3fb commit 58756bf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.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-26-intel is Intel.
244-
# macos-26-intel only runs tests against the GIL-enabled CPython.
243+
# macos-26 is Apple Silicon, macos-15-intel is Intel.
244+
# macos-15-intel only runs tests against the GIL-enabled CPython.
245245
os:
246246
- macos-26
247-
- macos-26-intel
247+
- macos-15-intel
248248
free-threading:
249249
- false
250250
- true
251251
exclude:
252-
- os: macos-26-intel
252+
- os: macos-15-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
@@ -52,15 +52,15 @@ jobs:
5252
--prefix=/opt/python-dev \
5353
--with-openssl="$(brew --prefix openssl@3.0)"
5454
- name: Build CPython
55-
if : ${{ inputs.free-threading || inputs.os != 'macos-26-intel' }}
55+
if : ${{ inputs.free-threading || inputs.os != 'macos-15-intel' }}
5656
run: gmake -j8
5757
- name: Build CPython for compiler warning check
58-
if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
58+
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
5959
run: set -o pipefail; gmake -j8 --output-sync 2>&1 | tee compiler_output_macos.txt
6060
- name: Display build info
6161
run: make pythoninfo
6262
- name: Check compiler warnings
63-
if : ${{ !inputs.free-threading && inputs.os == 'macos-26-intel' }}
63+
if : ${{ !inputs.free-threading && inputs.os == 'macos-15-intel' }}
6464
run: >-
6565
python3 Tools/build/check_warnings.py
6666
--compiler-output-file-path=compiler_output_macos.txt

0 commit comments

Comments
 (0)