Skip to content

Commit 9d43a7e

Browse files
committed
This is difficult
1 parent b6d1d79 commit 9d43a7e

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

.github/workflows/wheels.yaml

+6-18
Original file line numberDiff line numberDiff line change
@@ -289,36 +289,27 @@ jobs:
289289
run: pip install -r requirements.txt
290290

291291
- name: Install XCode
292-
if: matrix.os == 'macos-latest'
292+
if: runner.os == 'macOS'
293293
uses: maxim-lobanov/[email protected]
294294
with:
295295
xcode-version: latest
296296

297-
# This doesn't work for some reason
298-
# - name: Install Clang
299-
# if: matrix.os == 'macos-latest'
300-
# uses: KyleMayes/install-llvm-action@v1
301-
# with:
302-
# version: "15.0"
303-
# directory: "./llvm"
304-
# env: on
305-
306297
- name: Install Clang
307-
if: matrix.os == 'macos-latest'
298+
if: runner.os == 'macOS'
308299
run: |
309300
rm -f '/usr/local/bin/2to3*'
310301
brew install llvm libomp
311302
312303
- name: Install Clang
313-
if: matrix.os == 'windows-latest'
304+
if: runner.os == 'Windows'
314305
uses: KyleMayes/install-llvm-action@v1
315306
with:
316307
version: '15.0'
317308
directory: ${RUNNER_TOOL_CACHE}
318309
env: on
319310

320311
- name: Build Wheels
321-
if: runner.os == 'macos-latest'
312+
if: runner.os == 'macOS'
322313
env:
323314
CIBW_BUILD: ${{ matrix.pythonType }}${{ matrix.pythonVersion }}-${{ matrix.platformID }}
324315
CIBW_ARCHS: all
@@ -340,7 +331,7 @@ jobs:
340331
python -m cibuildwheel --output-dir wheelhouse
341332
342333
- name: Build Wheels
343-
if: runner.os == 'windows-latest'
334+
if: runner.os == 'Windows'
344335
env:
345336
CIBW_BUILD: ${{ matrix.pythonType }}${{ matrix.pythonVersion }}-${{ matrix.platformID }}
346337
CIBW_ARCHS: all
@@ -355,14 +346,12 @@ jobs:
355346
LIBRAPID_GET_FFTW: OFF
356347
CC: ${RUNNER_TOOL_CACHE}/llvm/bin/clang
357348
CXX: ${RUNNER_TOOL_CACHE}/llvm/bin/clang++
358-
359-
360349
run: |
361350
python -m pip install cibuildwheel
362351
python -m cibuildwheel --output-dir wheelhouse
363352
364353
- name: Build Wheels
365-
if: runner.os == 'ubuntu-latest'
354+
if: runner.os == 'Linux'
366355
env:
367356
CIBW_BUILD: ${{ matrix.pythonType }}${{ matrix.pythonVersion }}-${{ matrix.platformID }}
368357
CIBW_ARCHS: all
@@ -375,7 +364,6 @@ jobs:
375364
GITHUB_ACTIONS: ON
376365
LIBRAPID_GET_BLAS: ON
377366
LIBRAPID_GET_FFTW: OFF
378-
379367
run: |
380368
python -m pip install cibuildwheel
381369
python -m cibuildwheel --output-dir wheelhouse

0 commit comments

Comments
 (0)