@@ -169,8 +169,11 @@ jobs:
169169 NO_PERL : 1
170170 GIT_CONFIG_PARAMETERS : " 'user.name=CI' 'user.email=ci@git'"
171171 runs-on : windows-latest
172+ strategy :
173+ matrix :
174+ arch : [x64, arm64]
172175 concurrency :
173- group : vs-build-${{ github.ref }}
176+ group : vs-build-${{ github.ref }}-${{ matrix.arch }}
174177 cancel-in-progress : ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
175178 steps :
176179 - uses : actions/checkout@v4
@@ -189,14 +192,14 @@ jobs:
189192 uses : microsoft/setup-msbuild@v2
190193 - name : copy dlls to root
191194 shell : cmd
192- run : compat\vcbuild\vcpkg_copy_dlls.bat release
195+ run : compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
193196 - name : generate Visual Studio solution
194197 shell : bash
195198 run : |
196- cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64 -windows \
197- -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
199+ cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }} -windows \
200+ -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
198201 - name : MSBuild
199- run : msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
202+ run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
200203 - name : bundle artifact tar
201204 shell : bash
202205 env :
@@ -210,7 +213,7 @@ jobs:
210213 - name : upload tracked files and build artifacts
211214 uses : actions/upload-artifact@v4
212215 with :
213- name : vs-artifacts
216+ name : vs-artifacts-${{ matrix.arch }}
214217 path : artifacts
215218 vs-test :
216219 name : win+VS test
@@ -228,7 +231,7 @@ jobs:
228231 - name : download tracked files and build artifacts
229232 uses : actions/download-artifact@v4
230233 with :
231- name : vs-artifacts
234+ name : vs-artifacts-x64
232235 path : ${{github.workspace}}
233236 - name : extract tracked files and build artifacts
234237 shell : bash
0 commit comments