Skip to content

Commit acb81db

Browse files
dennisamelingmjcheetham
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 01704b5 commit acb81db

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,11 @@ jobs:
152152
NO_PERL: 1
153153
GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
154154
runs-on: windows-latest
155+
strategy:
156+
matrix:
157+
arch: [x64, arm64]
155158
concurrency:
156-
group: vs-build-${{ github.ref }}
159+
group: vs-build-${{ github.ref }}-${{ matrix.arch }}
157160
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
158161
steps:
159162
- uses: actions/checkout@v3
@@ -176,14 +179,14 @@ jobs:
176179
uses: microsoft/setup-msbuild@v1
177180
- name: copy dlls to root
178181
shell: cmd
179-
run: compat\vcbuild\vcpkg_copy_dlls.bat release
182+
run: compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
180183
- name: generate Visual Studio solution
181184
shell: bash
182185
run: |
183-
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
184-
-DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
186+
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
187+
-DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
185188
- name: MSBuild
186-
run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
189+
run: msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
187190
- name: bundle artifact tar
188191
shell: bash
189192
env:
@@ -197,7 +200,7 @@ jobs:
197200
- name: upload tracked files and build artifacts
198201
uses: actions/upload-artifact@v3
199202
with:
200-
name: vs-artifacts
203+
name: vs-artifacts-${{ matrix.arch }}
201204
path: artifacts
202205
vs-test:
203206
name: win+VS test
@@ -215,7 +218,7 @@ jobs:
215218
- name: download tracked files and build artifacts
216219
uses: actions/download-artifact@v3
217220
with:
218-
name: vs-artifacts
221+
name: vs-artifacts-x64
219222
path: ${{github.workspace}}
220223
- name: extract tracked files and build artifacts
221224
shell: bash

0 commit comments

Comments
 (0)