Skip to content

Commit 77bc0b4

Browse files
committed
Try another thing
1 parent ea621d6 commit 77bc0b4

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

.github/workflows/build-wheels.yaml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
steps:
6060
- uses: actions/checkout@v5
61-
- name: Install Fortran compiler
61+
- name: Install Fortran compiler - MacOS
6262
# When building on Mac, we need to have a Fortran compiler
6363
if: ${{ startsWith(matrix.os, 'macos') }}
6464
uses: fortran-lang/setup-fortran@v1
@@ -67,16 +67,21 @@ jobs:
6767
# TODO: figure out whether we need/want to use other compilers too
6868
compiler: "gcc"
6969
version: "13"
70-
- name: Build wheels
71-
# TODO: remove
72-
if: matrix.cibw_archs == 'AMD64'
73-
uses: pypa/cibuildwheel@v3.1.4 # matplotlib had v3.1.3
70+
- name: Specify MSVC toolchain - windows-arm
71+
# When building on windows ARM, we need to use the MSVC toolchain
72+
run: |
73+
echo 'CIBW_CONFIG_SETTINGS_WINDOWS=setup-args="--vsenv" setup-args="-Db_vscrt=mt"' >> $GITHUB_ENV
74+
# TODO: figure out escaping and add back in (?)
75+
# setup-args="-Dcpp_link_args=['ucrt.lib','vcruntime.lib','/nodefaultlib:libucrt.lib','/nodefaultlib:libvcruntime.lib']"
76+
- name: Install Fortran compiler - windows-arm
77+
# When building on windows ARM, we need to use the MSVC toolchain
78+
if: ${{ matrix.os == 'windows-11-arm' }}
79+
uses: fortran-lang/setup-fortran@v1
80+
id: setup-fortran
7481
with:
75-
package-dir: .
76-
output-dir: wheelhouse
77-
config-file: "{package}/pyproject.toml"
78-
env:
79-
CIBW_ARCHS: ${{ matrix.cibw_archs }}
82+
# TODO: figure out whether we need/want to use other compilers too
83+
compiler: "intel"
84+
version: "2025.0"
8085
- name: Build wheels
8186
uses: pypa/cibuildwheel@v3.1.4 # matplotlib had v3.1.3
8287
with:

0 commit comments

Comments
 (0)