Skip to content

Commit e76a26f

Browse files
committed
Try a different permutation
1 parent 9630897 commit e76a26f

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

.github/workflows/wheels.yaml

+25-24
Original file line numberDiff line numberDiff line change
@@ -182,87 +182,87 @@ jobs:
182182

183183

184184
# MacOS x86_64
185-
- os: macos-13
185+
- os: macos-latest
186186
pythonVersion: 37
187187
bitness: 64
188188
platformID: macosx_x86_64
189189
pythonType: "cp"
190190

191-
- os: macos-13
191+
- os: macos-latest
192192
pythonVersion: 38
193193
bitness: 64
194194
platformID: macosx_x86_64
195195
pythonType: "cp"
196196

197-
- os: macos-13
197+
- os: macos-latest
198198
pythonVersion: 39
199199
bitness: 64
200200
platformID: macosx_x86_64
201201
pythonType: "cp"
202202

203-
- os: macos-13
203+
- os: macos-latest
204204
pythonVersion: 310
205205
bitness: 64
206206
platformID: macosx_x86_64
207207
pythonType: "cp"
208208

209-
- os: macos-13
209+
- os: macos-latest
210210
pythonVersion: 311
211211
bitness: 64
212212
platformID: macosx_x86_64
213213
pythonType: "cp"
214214

215-
- os: macos-13
215+
- os: macos-latest
216216
pythonVersion: 312
217217
bitness: 64
218218
platformID: macosx_x86_64
219219
pythonType: "cp"
220220

221221
# Apple-Silicon MacOS
222-
- os: macos-13
222+
- os: macos-latest
223223
pythonVersion: 38
224224
bitness: 64
225225
platformID: macosx_arm64
226226
pythonType: "cp"
227227

228-
- os: macos-13
228+
- os: macos-latest
229229
pythonVersion: 39
230230
bitness: 64
231231
platformID: macosx_arm64
232232
pythonType: "cp"
233233

234-
- os: macos-13
234+
- os: macos-latest
235235
pythonVersion: 310
236236
bitness: 64
237237
platformID: macosx_arm64
238238
pythonType: "cp"
239239

240-
- os: macos-13
240+
- os: macos-latest
241241
pythonVersion: 311
242242
bitness: 64
243243
platformID: macosx_arm64
244244
pythonType: "cp"
245245

246-
- os: macos-13
246+
- os: macos-latest
247247
pythonVersion: 312
248248
bitness: 64
249249
platformID: macosx_arm64
250250
pythonType: "cp"
251251

252252
# Apple-Silicon MacOS PyPy
253-
# - os: macos-13
253+
# - os: macos-latest
254254
# pythonVersion: 38
255255
# bitness: 64
256256
# platformID: macosx_arm64
257257
# pythonType: "pp"
258258

259-
# - os: macos-13
259+
# - os: macos-latest
260260
# pythonVersion: 39
261261
# bitness: 64
262262
# platformID: macosx_arm64
263263
# pythonType: "pp"
264264

265-
# - os: macos-13
265+
# - os: macos-latest
266266
# pythonVersion: 310
267267
# bitness: 64
268268
# platformID: macosx_arm64
@@ -283,26 +283,25 @@ jobs:
283283
run: pip install -r requirements.txt
284284

285285
- name: Install XCode
286-
if: matrix.os == 'macos-13'
286+
if: matrix.os == 'macos-latest'
287287
uses: maxim-lobanov/[email protected]
288288
with:
289289
xcode-version: latest
290290

291291
# This doesn't work for some reason
292292
# - name: Install Clang
293-
# if: matrix.os == 'macos-13'
293+
# if: matrix.os == 'macos-latest'
294294
# uses: KyleMayes/install-llvm-action@v1
295295
# with:
296296
# version: "15.0"
297297
# directory: "./llvm"
298298
# env: on
299299

300-
# This also doesn't work :(
301-
# - name: Install Clang
302-
# if: matrix.os == 'macos-13'
303-
# run: |
304-
# rm -f '/usr/local/bin/2to3*'
305-
# brew install llvm libomp
300+
- name: Install Clang
301+
if: matrix.os == 'macos-latest'
302+
run: |
303+
rm -f '/usr/local/bin/2to3*'
304+
brew install llvm libomp
306305
307306
- name: Build Wheels
308307
if: runner.os == 'macOS'
@@ -319,8 +318,10 @@ jobs:
319318
GITHUB_ACTIONS: ON
320319
LIBRAPID_GET_BLAS: OFF
321320
LIBRAPID_GET_FFTW: OFF
322-
CC: $(brew --prefix llvm)/bin/clang
323-
CXX: $(brew --prefix llvm)/bin/clang++
321+
CC: /usr/local/opt/llvm/bin/clang
322+
CXX: /usr/local/opt/llvm/bin/clang++
323+
# CC: $(brew --prefix llvm)/bin/clang
324+
# CXX: $(brew --prefix llvm)/bin/clang++
324325

325326
run: |
326327
python -m pip install cibuildwheel

0 commit comments

Comments
 (0)