Skip to content

Commit 05cd2a2

Browse files
committed
Build: Set up msvc on arm64.
1 parent 9aa4139 commit 05cd2a2

1 file changed

Lines changed: 7 additions & 19 deletions

File tree

.github/workflows/wheels.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,11 @@ jobs:
129129
brew install automake libtool
130130
ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
131131
132-
- name: Setup Visual Studio for x64
133-
if: contains(matrix.os, 'windows') && contains(matrix.only, 'win_amd64')
134-
uses: TheMrMilchmann/setup-msvc-dev@v4
135-
with:
136-
arch: x64
137-
138-
- name: Setup Visual Studio for x86
139-
if: contains(matrix.os, 'windows') && contains(matrix.only, 'win32')
140-
uses: TheMrMilchmann/setup-msvc-dev@v4
132+
- name: Setup Visual Studio
133+
if: contains(matrix.os, 'windows')
134+
uses: TheMrMilchmann/setup-msvc-dev@79dac248aac9d0059f86eae9d8b5bfab4e95e97c # v4.0.0
141135
with:
142-
arch: x86
136+
arch: ${{ contains(matrix.only, 'win_amd64') && 'x64' || contains(matrix.only, 'win32') && 'x86' || contains(matrix.only, 'arm') && 'arm64' || '' }}
143137

144138
- name: Fix link in Windows
145139
if: contains(matrix.os, 'windows')
@@ -202,17 +196,11 @@ jobs:
202196
brew install automake libtool
203197
ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
204198
205-
- name: Setup Visual Studio for x64
206-
if: contains(matrix.os, 'windows') && contains(matrix.only, 'win_amd64')
207-
uses: TheMrMilchmann/setup-msvc-dev@79dac248aac9d0059f86eae9d8b5bfab4e95e97c # v4.0.0
208-
with:
209-
arch: x64
210-
211-
- name: Setup Visual Studio for x86
212-
if: contains(matrix.os, 'windows') && contains(matrix.only, 'win32')
199+
- name: Setup Visual Studio
200+
if: contains(matrix.os, 'windows')
213201
uses: TheMrMilchmann/setup-msvc-dev@79dac248aac9d0059f86eae9d8b5bfab4e95e97c # v4.0.0
214202
with:
215-
arch: x86
203+
arch: ${{ contains(matrix.only, 'win_amd64') && 'x64' || contains(matrix.only, 'win32') && 'x86' || contains(matrix.only, 'arm') && 'arm64' || '' }}
216204

217205
- name: Fix link in Windows
218206
if: contains(matrix.os, 'windows')

0 commit comments

Comments
 (0)