Skip to content

Commit 0ac6601

Browse files
committed
CI: macos-13 runner is retired, use macos-15-intel runner instead for x86_64 macOS build
1 parent b7683ae commit 0ac6601

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/test-and-publish.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
options:
1717
- ''
1818
- 'ubuntu-22.04'
19-
- 'macos-13'
19+
- 'macos-15-intel'
2020
- 'macos-14'
2121
- 'windows-2022'
2222
debug_enabled_python:
@@ -67,8 +67,8 @@ jobs:
6767
strategy:
6868
fail-fast: false
6969
matrix:
70-
# Use Ubuntu 22.04 / macOS 13 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
71-
os: [ 'ubuntu-22.04', 'macos-13', 'macos-14', 'ubuntu-22.04-arm' ] # macOS 14 runner exclusively runs on M1 hardwares
70+
# Use Ubuntu 22.04 / macOS 15 x86_64 / macOS 14 arm64 + Python 3.10 to build SpiderMonkey
71+
os: [ 'ubuntu-22.04', 'macos-15-intel', 'macos-14', 'ubuntu-22.04-arm' ] # macOS 14 runner exclusively runs on M1 hardwares
7272
# see https://github.blog/changelog/2024-01-30-github-actions-macos-14-sonoma-is-now-available
7373
python_version: [ '3.10' ]
7474
runs-on: ${{ matrix.os }}
@@ -124,10 +124,6 @@ jobs:
124124
if: ${{ !startsWith(matrix.os, 'ubuntu') && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
125125
with:
126126
python-version: ${{ matrix.python_version }}
127-
- name: Setup XCode
128-
if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
129-
# SpiderMonkey requires XCode SDK version at least 13.3
130-
run: sudo xcode-select -switch /Applications/Xcode_14.3.app
131127
- name: Build spidermonkey
132128
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
133129
run: ./setup.sh
@@ -181,7 +177,7 @@ jobs:
181177
strategy:
182178
fail-fast: false
183179
matrix:
184-
os: [ 'ubuntu-22.04', 'macos-13', 'macos-14', 'windows-2022', 'ubuntu-22.04-arm' ]
180+
os: [ 'ubuntu-22.04', 'macos-15-intel', 'macos-14', 'windows-2022', 'ubuntu-22.04-arm' ]
185181
python_version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14-dev' ]
186182
runs-on: ${{ matrix.os }}
187183
container: ${{ (startsWith(matrix.os, 'ubuntu') && 'ubuntu:20.04') || null }}
@@ -293,7 +289,7 @@ jobs:
293289
BUILD_TYPE=${WORKFLOW_BUILD_TYPE:-"Debug"} poetry build --format=wheel
294290
ls -lah ./dist/
295291
- name: Make the wheels we build also support lower versions of macOS
296-
if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14' }}
292+
if: ${{ matrix.os == 'macos-15-intel' || matrix.os == 'macos-14' }}
297293
# Change the platform tag part of the wheel filename to `macosx_11_0_xxx` (means to support macOS 11.0 and above)
298294
# See https://packaging.python.org/en/latest/specifications/binary-distribution-format/#file-format
299295
# A wheel package file will only be selected by pip to install if the platform tag satisfies, regardless of whether the binary compatibility actually is.

0 commit comments

Comments
 (0)