Skip to content

Commit 040e4c9

Browse files
committed
chore(ci): Use macos-latest for arm64, macos-15-intel for x64
1 parent a8b017e commit 040e4c9

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

.github/workflows/test.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
strategy:
113113
fail-fast: false
114114
matrix:
115-
os: ['ubuntu-latest', 'windows-latest', 'macos-14', 'macos-latest']
115+
os: ['ubuntu-latest', 'windows-latest', 'macos-latest', 'macos-15-intel']
116116
python-version:
117117
- "3.10"
118118
- "3.11"
@@ -150,14 +150,6 @@ jobs:
150150
python-version: "3.13"
151151
- os: windows-latest
152152
python-version: "3.13t"
153-
- os: macos-14
154-
python-version: "3.11"
155-
- os: macos-14
156-
python-version: "3.12"
157-
- os: macos-14
158-
python-version: "3.13"
159-
- os: macos-14
160-
python-version: "3.13t"
161153
- os: macos-latest
162154
python-version: "3.11"
163155
- os: macos-latest
@@ -166,20 +158,30 @@ jobs:
166158
python-version: "3.13"
167159
- os: macos-latest
168160
python-version: "3.13t"
161+
- os: macos-15-intel
162+
python-version: "3.11"
163+
- os: macos-15-intel
164+
python-version: "3.12"
165+
- os: macos-15-intel
166+
python-version: "3.13"
167+
- os: macos-15-intel
168+
python-version: "3.13t"
169169

170170
## Unavailable architectures
171-
# x86 is available for Windows
171+
# x86 is available for Windows and Mac
172172
- os: ubuntu-latest
173173
architecture: x86
174-
- os: macos-14
175-
architecture: x86
176174
- os: macos-latest
177175
architecture: x86
176+
- os: macos-15-intel
177+
architecture: x86
178178
# arm64 is available for macos-14+
179179
- os: ubuntu-latest
180180
architecture: arm64
181181
- os: windows-latest
182182
architecture: arm64
183+
- os: macos-15-intel
184+
architecture: arm64
183185
# x64 is not available for macos-15
184186
- os: macos-latest
185187
architecture: x64
@@ -215,14 +217,16 @@ jobs:
215217
- name: Set up Python ${{ matrix.python-version }}
216218
if: endsWith(matrix.python-version, 't')
217219
run: |
218-
echo "UV_PYTHON=${IMPL}-${VERSION}-${OS%-*}-${ARCH}-${LIBC}" >> $GITHUB_ENV
220+
echo "UV_PYTHON=${IMPL}-${VERSION}-${OS}-${ARCH}-${LIBC}" >> $GITHUB_ENV
219221
source $GITHUB_ENV
220222
uv python install $UV_PYTHON
221223
env:
222224
IMPL: cpython
223225
VERSION: ${{ matrix.python-version }}
224226
# uv expects linux|macos|windows, we can drop the -* but need to rename ubuntu
225-
OS: ${{ matrix.os == 'ubuntu-latest' && 'linux' || matrix.os }}
227+
OS: ${{ matrix.os == 'ubuntu-latest' && 'linux' ||
228+
matrix.os.startsWith('macos') && 'macos' ||
229+
matrix.os }}
226230
# uv expects x86, x86_64, aarch64 (among others)
227231
ARCH: ${{ matrix.architecture == 'x64' && 'x86_64' ||
228232
matrix.architecture == 'arm64' && 'aarch64' ||

0 commit comments

Comments
 (0)