@@ -81,10 +81,12 @@ jobs:
8181 include : ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
8282 steps :
8383 - if : contains(matrix.os, 'windows')
84- uses : msys2/setup-msys2@v2.22 .0
84+ uses : msys2/setup-msys2@v2.21 .0
8585 with :
86- # i686 jobs use mingw32. x86_64 and cross-compile jobs use mingw64.
87- msystem : ${{ contains(matrix.name, 'i686') && 'mingw32' || 'mingw64' }}
86+ # i686 jobs use mingw32.
87+ # aarch64 runners use clangarm64.
88+ # x86_64 and cross-compile jobs use mingw64.
89+ msystem : ${{ contains(matrix.name, 'i686') && 'mingw32' || contains(matrix.os, 'arm64') && 'clangarm64' || 'mingw64' }}
8890 # don't try to download updates for already installed packages
8991 update : false
9092 # don't try to use the msys that comes built-in to the github runner,
9799 make
98100 dos2unix
99101 diffutils
102+ ${{ contains(matrix.os, 'windows') && contains(matrix.os, 'arm64') && 'git' || '' }}
103+
104+ - if : contains(matrix.os, 'windows') && contains(matrix.os, 'arm64')
105+ name : install VS on Windows Arm64
106+ shell : powershell
107+ run : |
108+ Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile '${{ runner.temp }}\vs_buildtools.exe'
109+ &'${{ runner.temp }}\vs_buildtools.exe' --quiet --norestart --wait --nocache --add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.Windows11SDK.22621
100110
101111 - name : disable git crlf conversion
102112 run : git config --global core.autocrlf false
0 commit comments