diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index e9df33ee12..2e12fde5ee 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -44,13 +44,16 @@ jobs: windows: name: Windows - runs-on: windows-latest + runs-on: ${{ matrix.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }} strategy: matrix: - arch: [x64_x86, x64] + arch: [x64_x86, x64, arm64] qt: ["", qt6] generator: ["", "Ninja Multi-Config"] + exclude: + - arch: arm64 + qt: "" env: UPLOAD_ARTIFACT: "true" @@ -83,7 +86,7 @@ jobs: shell: bash run: | DOCPATH=$TBUILD/$REPO_NAME/docs/building-win.md - [ "${{ matrix.arch }}" != x64_x86 ] && DOCPATH=$TBUILD/$REPO_NAME/docs/building-win-${{ matrix.arch }}.md + [ "${{ matrix.arch }}" = x64 ] && DOCPATH=$TBUILD/$REPO_NAME/docs/building-win-x64.md SDK="$(grep "SDK version" $DOCPATH | sed -r 's/.*\*\*(.*)\*\* SDK version.*/\1/')" echo "SDK=$SDK" >> $GITHUB_ENV @@ -155,6 +158,7 @@ jobs: if [ -n "${{ matrix.arch }}" ]; then case "${{ matrix.arch }}" in x64_x86) ARCH="x86";; + arm64) ARCH="arm";; *) ARCH="${{ matrix.arch }}";; esac echo "Architecture from matrix: $ARCH"