@@ -152,8 +152,11 @@ jobs:
152
152
NO_PERL : 1
153
153
GIT_CONFIG_PARAMETERS : " 'user.name=CI' 'user.email=ci@git'"
154
154
runs-on : windows-latest
155
+ strategy :
156
+ matrix :
157
+ arch : [x64, arm64]
155
158
concurrency :
156
- group : vs-build-${{ github.ref }}
159
+ group : vs-build-${{ github.ref }}-${{ matrix.arch }}
157
160
cancel-in-progress : ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
158
161
steps :
159
162
- uses : actions/checkout@v3
@@ -176,14 +179,14 @@ jobs:
176
179
uses : microsoft/setup-msbuild@v1
177
180
- name : copy dlls to root
178
181
shell : cmd
179
- run : compat\vcbuild\vcpkg_copy_dlls.bat release
182
+ run : compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
180
183
- name : generate Visual Studio solution
181
184
shell : bash
182
185
run : |
183
- cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64 -windows \
184
- -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
186
+ cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }} -windows \
187
+ -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
185
188
- name : MSBuild
186
- run : msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
189
+ run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
187
190
- name : bundle artifact tar
188
191
shell : bash
189
192
env :
@@ -197,7 +200,7 @@ jobs:
197
200
- name : upload tracked files and build artifacts
198
201
uses : actions/upload-artifact@v3
199
202
with :
200
- name : vs-artifacts
203
+ name : vs-artifacts-${{ matrix.arch }}
201
204
path : artifacts
202
205
vs-test :
203
206
name : win+VS test
@@ -215,7 +218,7 @@ jobs:
215
218
- name : download tracked files and build artifacts
216
219
uses : actions/download-artifact@v3
217
220
with :
218
- name : vs-artifacts
221
+ name : vs-artifacts-x64
219
222
path : ${{github.workspace}}
220
223
- name : extract tracked files and build artifacts
221
224
shell : bash
0 commit comments