actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-16 06:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Test-IsWin19 WSL condition (#6477)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2022-10-27 09:26:49 +02:00
committed by GitHub
parent cc71c8b504
commit 715747a054
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -26,13 +26,10 @@ $markdown += New-MDList -Style Unordered -Lines @(
"Image Version: $env:IMAGE_VERSION" "Image Version: $env:IMAGE_VERSION"
) )
if ((Test-IsWin19) -or (Test-IsWin22)) $markdown += New-MDHeader "Enabled windows optional features" -Level 2
{ $markdown += New-MDList -Style Unordered -Lines @(
$markdown += New-MDHeader "Enabled windows optional features" -Level 2 "Windows Subsystem for Linux [WSLv1]"
$markdown += New-MDList -Style Unordered -Lines @( )
"Windows Subsystem for Linux [WSLv1]"
)
}
$markdown += New-MDHeader "Installed Software" -Level 2 $markdown += New-MDHeader "Installed Software" -Level 2
$markdown += New-MDHeader "Language and Runtime" -Level 3 $markdown += New-MDHeader "Language and Runtime" -Level 3

4
images/win/scripts/Tests/Shell.Tests.ps1
View File

@@ -2,10 +2,8 @@ Describe "Shell" {
$shellTestCases = @( $shellTestCases = @(
@{Name = "C:\shells\gitbash.exe"; Target = "$env:ProgramFiles\Git\bin\bash.exe"}, @{Name = "C:\shells\gitbash.exe"; Target = "$env:ProgramFiles\Git\bin\bash.exe"},
@{Name = "C:\shells\msys2bash.cmd"; Target = $null} @{Name = "C:\shells\msys2bash.cmd"; Target = $null}
@{Name = "C:\shells\wslbash.exe"; Target = "$env:SystemRoot\System32\bash.exe"}
) )
if (Test-IsWin19) {
$shellTestCases += @{Name = "C:\shells\wslbash.exe"; Target = "$env:SystemRoot\System32\bash.exe"}
}
It "<Name> target to <Target>" -TestCases $shellTestCases { It "<Name> target to <Target>" -TestCases $shellTestCases {
(Get-Item $Name).Target | Should -BeExactly $Target (Get-Item $Name).Target | Should -BeExactly $Target