Skip to content

Commit 712dee3

Browse files
dennisamelingdscho
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 d35c6be commit 712dee3

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
@@ -173,8 +173,11 @@ jobs:
173173
NO_PERL: 1
174174
GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
175175
runs-on: windows-latest
176+
strategy:
177+
matrix:
178+
arch: [x64, arm64]
176179
concurrency:
177-
group: vs-build-${{ github.ref }}
180+
group: vs-build-${{ github.ref }}-${{ matrix.arch }}
178181
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
179182
steps:
180183
- uses: actions/checkout@v4
@@ -193,14 +196,14 @@ jobs:
193196
uses: microsoft/setup-msbuild@v2
194197
- name: copy dlls to root
195198
shell: cmd
196-
run: compat\vcbuild\vcpkg_copy_dlls.bat release
199+
run: compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
197200
- name: generate Visual Studio solution
198201
shell: bash
199202
run: |
200-
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
201-
-DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
203+
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/${{ matrix.arch }}-windows \
204+
-DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DVCPKG_ARCH=${{ matrix.arch }}-windows
202205
- name: MSBuild
203-
run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
206+
run: msbuild git.sln -property:Configuration=Release -property:Platform=${{ matrix.arch }} -maxCpuCount:4 -property:PlatformToolset=v142
204207
- name: bundle artifact tar
205208
shell: bash
206209
env:
@@ -214,7 +217,7 @@ jobs:
214217
- name: upload tracked files and build artifacts
215218
uses: actions/upload-artifact@v4
216219
with:
217-
name: vs-artifacts
220+
name: vs-artifacts-${{ matrix.arch }}
218221
path: artifacts
219222
vs-test:
220223
name: win+VS test
@@ -232,7 +235,7 @@ jobs:
232235
- name: download tracked files and build artifacts
233236
uses: actions/download-artifact@v4
234237
with:
235-
name: vs-artifacts
238+
name: vs-artifacts-x64
236239
path: ${{github.workspace}}
237240
- name: extract tracked files and build artifacts
238241
shell: bash

0 commit comments

Comments
 (0)