@@ -137,6 +137,9 @@ jobs:
137137 NO_PERL : 1
138138 GIT_CONFIG_PARAMETERS : " 'user.name=CI' 'user.email=ci@git'"
139139 runs-on : windows-latest
140+ strategy :
141+ matrix :
142+ arch : [x64, arm64]
140143 steps :
141144 - uses : actions/checkout@v3
142145 - uses : git-for-windows/setup-git-for-windows-sdk@v1
@@ -158,14 +161,14 @@ jobs:
158161 uses : microsoft/setup-msbuild@v1
159162 - name : copy dlls to root
160163 shell : cmd
161- run : compat\vcbuild\vcpkg_copy_dlls.bat release
164+ run : compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
162165 - name : generate Visual Studio solution
163166 shell : bash
164167 run : |
165- cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64 -windows \
166- -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
168+ cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }} -windows \
169+ -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
167170 - name : MSBuild
168- run : msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
171+ run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
169172 - name : bundle artifact tar
170173 shell : bash
171174 env :
@@ -179,7 +182,7 @@ jobs:
179182 - name : upload tracked files and build artifacts
180183 uses : actions/upload-artifact@v3
181184 with :
182- name : vs-artifacts
185+ name : vs-artifacts-${{ matrix.arch }}
183186 path : artifacts
184187 vs-test :
185188 name : win+VS test
@@ -194,7 +197,7 @@ jobs:
194197 - name : download tracked files and build artifacts
195198 uses : actions/download-artifact@v3
196199 with :
197- name : vs-artifacts
200+ name : vs-artifacts-x64
198201 path : ${{github.workspace}}
199202 - name : extract tracked files and build artifacts
200203 shell : bash
0 commit comments