@@ -137,6 +137,9 @@ jobs:
137
137
NO_PERL : 1
138
138
GIT_CONFIG_PARAMETERS : " 'user.name=CI' 'user.email=ci@git'"
139
139
runs-on : windows-latest
140
+ strategy :
141
+ matrix :
142
+ arch : [x64, arm64]
140
143
steps :
141
144
- uses : actions/checkout@v2
142
145
- uses : git-for-windows/setup-git-for-windows-sdk@v1
@@ -158,14 +161,14 @@ jobs:
158
161
uses : microsoft/setup-msbuild@v1
159
162
- name : copy dlls to root
160
163
shell : cmd
161
- run : compat\vcbuild\vcpkg_copy_dlls.bat release
164
+ run : compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
162
165
- name : generate Visual Studio solution
163
166
shell : bash
164
167
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
167
170
- 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
169
172
- name : bundle artifact tar
170
173
shell : bash
171
174
env :
@@ -179,7 +182,7 @@ jobs:
179
182
- name : upload tracked files and build artifacts
180
183
uses : actions/upload-artifact@v2
181
184
with :
182
- name : vs-artifacts
185
+ name : vs-artifacts-${{ matrix.arch }}
183
186
path : artifacts
184
187
vs-test :
185
188
name : win+VS test
@@ -194,7 +197,7 @@ jobs:
194
197
- name : download tracked files and build artifacts
195
198
uses : actions/download-artifact@v2
196
199
with :
197
- name : vs-artifacts
200
+ name : vs-artifacts-x64
198
201
path : ${{github.workspace}}
199
202
- name : extract tracked files and build artifacts
200
203
shell : bash
0 commit comments