Skip to content

Commit c289f6c

Browse files
authored
Add Windows on Arm test coverage (#3577)
1 parent 83d4e0b commit c289f6c

File tree

3 files changed

+213
-204
lines changed

3 files changed

+213
-204
lines changed

.github/actions/fix-environment/action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,27 @@ runs:
2929
}
3030
"i686*"
3131
{
32-
"${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\x86" >> $env:GITHUB_PATH
32+
"${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\x86" >> $env:GITHUB_PATH
3333
((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx86\x86")
3434
| Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
3535
}
3636
"x86_64*"
3737
{
38-
"${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
38+
"${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\x64" >> $env:GITHUB_PATH
3939
((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\x64")
4040
| Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
4141
}
4242
"aarch64*"
4343
{
44-
"${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
45-
((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\x64")
44+
"${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\arm64" >> $env:GITHUB_PATH
45+
((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
4646
| Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
4747
}
4848
"*"
4949
{
5050
(Join-Path $env:GITHUB_WORKSPACE "target\debug\deps").ToString() >> $env:GITHUB_PATH
5151
(Join-Path $env:GITHUB_WORKSPACE "target\test\debug\deps").ToString() >> $env:GITHUB_PATH
52-
"INCLUDE=${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.22000.0\winrt;${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.22000.0\cppwinrt" `
52+
"INCLUDE=${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.26100.0\winrt;${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.26100.0\cppwinrt" `
5353
>> $env:GITHUB_ENV
5454
}
5555
}
@@ -64,3 +64,4 @@ runs:
6464
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-llvm
6565
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-i686-gcc
6666
C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-gcc
67+
if: ${{ !contains(matrix.runner, 'windows-11-arm') }}

0 commit comments

Comments
 (0)