@@ -173,8 +173,11 @@ jobs:
173
173
NO_PERL : 1
174
174
GIT_CONFIG_PARAMETERS : " 'user.name=CI' 'user.email=ci@git'"
175
175
runs-on : windows-latest
176
+ strategy :
177
+ matrix :
178
+ arch : [x64, arm64]
176
179
concurrency :
177
- group : vs-build-${{ github.ref }}
180
+ group : vs-build-${{ github.ref }}-${{ matrix.arch }}
178
181
cancel-in-progress : ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
179
182
steps :
180
183
- uses : actions/checkout@v4
@@ -193,14 +196,14 @@ jobs:
193
196
uses : microsoft/setup-msbuild@v2
194
197
- name : copy dlls to root
195
198
shell : cmd
196
- run : compat\vcbuild\vcpkg_copy_dlls.bat release
199
+ run : compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
197
200
- name : generate Visual Studio solution
198
201
shell : bash
199
202
run : |
200
- cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64 -windows \
201
- -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
203
+ cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }} -windows \
204
+ -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
202
205
- name : MSBuild
203
- run : msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
206
+ run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
204
207
- name : bundle artifact tar
205
208
shell : bash
206
209
env :
@@ -214,7 +217,7 @@ jobs:
214
217
- name : upload tracked files and build artifacts
215
218
uses : actions/upload-artifact@v4
216
219
with :
217
- name : vs-artifacts
220
+ name : vs-artifacts-${{ matrix.arch }}
218
221
path : artifacts
219
222
vs-test :
220
223
name : win+VS test
@@ -232,7 +235,7 @@ jobs:
232
235
- name : download tracked files and build artifacts
233
236
uses : actions/download-artifact@v4
234
237
with :
235
- name : vs-artifacts
238
+ name : vs-artifacts-x64
236
239
path : ${{github.workspace}}
237
240
- name : extract tracked files and build artifacts
238
241
shell : bash
0 commit comments