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

Revert "[windows] add bash wrapper from git (#1937)"

Browse Source 
This reverts commit 8798c75d67.
This commit is contained in:
Aleksandr Chebotov
2020-11-05 11:37:02 +03:00
committed by GitHub
parent f5fdba51d7
commit 5c99d59f22
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/win/scripts/Installers/Configure-Shell.ps1
View File

@@ -3,8 +3,8 @@ $shellPath = "C:\shells"
New-Item -Path $shellPath -ItemType Directory | Out-Null
# sh and bash <--> C:\msys64\usr\bin\bash.exe
New-Item -ItemType SymbolicLink -Path "$shellPath\bash.exe" -Target "C:\msys64\bin\bash.exe" | Out-Null
New-Item -ItemType SymbolicLink -Path "$shellPath\sh.exe" -Target "C:\msys64\bin\sh.exe" | Out-Null
New-Item -ItemType SymbolicLink -Path "$shellPath\bash.exe" -Target "C:\msys64\usr\bin\bash.exe" | Out-Null
New-Item -ItemType SymbolicLink -Path "$shellPath\sh.exe" -Target "C:\msys64\usr\bin\sh.exe" | Out-Null
# WSL is available on Windows Server 2019
if (Test-IsWin19)

6
images/win/scripts/Installers/Install-Msys2.ps1
View File

@@ -95,10 +95,4 @@ if (Test-Path "C:\Program Files\Git\etc\ssh")
ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
}
# Copy bash wrapper from git
$wrapperPath = "C:\msys64\bin"
New-Item -Path $wrapperPath -ItemType Directory -Force | Out-Null
Copy-Item -Path "$env:ProgramFiles\Git\bin\bash.exe" -Destination $wrapperPath
Copy-Item -Path "$env:ProgramFiles\Git\bin\sh.exe" -Destination $wrapperPath
Invoke-PesterTests -TestFile "MSYS2"

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

@@ -1,7 +1,7 @@
Describe "Shell" {
$shellTestCases = @(
@{Name = "C:\shells\bash.exe"; Target = "C:\msys64\bin\bash.exe"},
@{Name = "C:\shells\sh.exe"; Target = "C:\msys64\bin\sh.exe"},
@{Name = "C:\shells\bash.exe"; Target = "C:\msys64\usr\bin\bash.exe"},
@{Name = "C:\shells\sh.exe"; Target = "C:\msys64\usr\bin\sh.exe"},
@{Name = "C:\shells\gitbash.exe"; Target = "$env:ProgramFiles\Git\bin\bash.exe"},
@{Name = "C:\shells\msysbash.exe"; Target = "C:\msys64\usr\bin\bash.exe"}
)