actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 14:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] win: add vcredist 2010 test (#4160)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2021-09-29 09:40:01 +03:00
committed by GitHub
parent efcefca087
commit b930b3d9d8
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/win/scripts/Installers/Install-VCRedist.ps1
View File

@@ -13,3 +13,5 @@ if (Test-IsWin19) {
Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList
Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList
} }
Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist"

16
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -165,6 +165,22 @@ Describe "Vcpkg" {
} }
} }
Describe "VCRedist" -Skip:(Test-IsWin22) {
It "vcredist_140" -Skip:(Test-IsWin19) {
"C:\Windows\System32\vcruntime140.dll" | Should -Exist
}
It "vcredist_2010_x64" -Skip:(Test-IsWin16) {
"HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist
"C:\Windows\System32\msvcr100.dll" | Should -Exist
}
It "vcredist_2010_x64" -Skip:(Test-IsWin16) {
"HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist
"C:\Windows\System32\msvcr100.dll" | Should -Exist
}
}
Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) { Describe "WebPlatformInstaller" -Skip:(Test-IsWin22) {
It "WebPlatformInstaller" { It "WebPlatformInstaller" {
"WebPICMD" | Should -ReturnZeroExitCode "WebPICMD" | Should -ReturnZeroExitCode

2
images/win/windows2019.json
View File

@@ -143,6 +143,8 @@
}, },
{ {
"type": "windows-restart", "type": "windows-restart",
"check_registry": true,
"restart_check_command": "powershell -command \"& {if (-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) { Write-Output 'Restart complete' }}\"",
"restart_timeout": "30m" "restart_timeout": "30m"
}, },
{ {

1
images/win/windows2022.json
View File

@@ -144,7 +144,6 @@
{ {
"type": "powershell", "type": "powershell",
"scripts": [ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1",
"{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
"{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
] ]