@@ -133,6 +133,9 @@ jobs:
133
133
NO_PERL : 1
134
134
GIT_CONFIG_PARAMETERS : " 'user.name=CI' 'user.email=ci@git'"
135
135
runs-on : windows-latest
136
+ strategy :
137
+ matrix :
138
+ arch : [x64, arm64]
136
139
steps :
137
140
- uses : actions/checkout@v2
138
141
- uses : git-for-windows/setup-git-for-windows-sdk@v1
@@ -154,14 +157,14 @@ jobs:
154
157
uses : microsoft/setup-msbuild@v1
155
158
- name : copy dlls to root
156
159
shell : cmd
157
- run : compat\vcbuild\vcpkg_copy_dlls.bat release
160
+ run : compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
158
161
- name : generate Visual Studio solution
159
162
shell : bash
160
163
run : |
161
- cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64 -windows \
162
- -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
164
+ cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }} -windows \
165
+ -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
163
166
- name : MSBuild
164
- run : msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
167
+ run : msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
165
168
- name : bundle artifact tar
166
169
shell : bash
167
170
env :
@@ -175,7 +178,7 @@ jobs:
175
178
- name : upload tracked files and build artifacts
176
179
uses : actions/upload-artifact@v2
177
180
with :
178
- name : vs-artifacts
181
+ name : vs-artifacts-${{ matrix.arch }}
179
182
path : artifacts
180
183
vs-test :
181
184
runs-on : windows-latest
@@ -189,7 +192,7 @@ jobs:
189
192
- name : download tracked files and build artifacts
190
193
uses : actions/download-artifact@v2
191
194
with :
192
- name : vs-artifacts
195
+ name : vs-artifacts-x64
193
196
path : ${{github.workspace}}
194
197
- name : extract tracked files and build artifacts
195
198
shell : bash
0 commit comments