Skip to content

Commit 2599c89

Browse files
dennisamelingGit for Windows Build Agent
authored andcommitted
ci(vs-build) also build Windows/ARM64 artifacts
There are no Windows/ARM64 agents in GitHub Actions yet, therefore we just skip adjusting the `vs-test` job for now. Signed-off-by: Dennis Ameling <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e46595e commit 2599c89

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ jobs:
133133
NO_PERL: 1
134134
GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
135135
runs-on: windows-latest
136+
strategy:
137+
matrix:
138+
arch: [x64, arm64]
136139
steps:
137140
- uses: actions/checkout@v2
138141
- uses: git-for-windows/setup-git-for-windows-sdk@v1
@@ -154,14 +157,14 @@ jobs:
154157
uses: microsoft/setup-msbuild@v1
155158
- name: copy dlls to root
156159
shell: cmd
157-
run: compat\vcbuild\vcpkg_copy_dlls.bat release
160+
run: compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
158161
- name: generate Visual Studio solution
159162
shell: bash
160163
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
163166
- 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
165168
- name: bundle artifact tar
166169
shell: bash
167170
env:
@@ -175,7 +178,7 @@ jobs:
175178
- name: upload tracked files and build artifacts
176179
uses: actions/upload-artifact@v2
177180
with:
178-
name: vs-artifacts
181+
name: vs-artifacts-${{ matrix.arch }}
179182
path: artifacts
180183
vs-test:
181184
runs-on: windows-latest
@@ -189,7 +192,7 @@ jobs:
189192
- name: download tracked files and build artifacts
190193
uses: actions/download-artifact@v2
191194
with:
192-
name: vs-artifacts
195+
name: vs-artifacts-x64
193196
path: ${{github.workspace}}
194197
- name: extract tracked files and build artifacts
195198
shell: bash

0 commit comments

Comments
 (0)