mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2025-12-24 10:28:10 +08:00
Revert "[Windows] Removed Git internal tools from PATH"
This commit is contained in:
committed by
GitHub
parent
ac4f5699c7
commit
635a57ab88
@@ -9,19 +9,35 @@
|
||||
|
||||
$dash = "-" * 40
|
||||
|
||||
# Downloading msys2
|
||||
$msys2Release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest"
|
||||
$msys2Uri = ((Invoke-RestMethod $msys2Release).assets | Where-Object {
|
||||
$_.name -match "x86_64" -and $_.name.EndsWith("sfx.exe") }).browser_download_url
|
||||
$msys2File = Start-DownloadWithRetry -Url $msys2Uri
|
||||
$origPath = $env:PATH
|
||||
$gitPath = "$env:ProgramFiles\Git"
|
||||
|
||||
# extract sfx.exe to C:\
|
||||
$msys2_release = "https://api.github.com/repos/msys2/msys2-installer/releases/latest"
|
||||
|
||||
$msys2Uri = ((Invoke-RestMethod $msys2_release).assets | Where-Object {
|
||||
$_.name -match "x86_64" -and $_.name.EndsWith("tar.xz") }).browser_download_url
|
||||
|
||||
# Download the latest msys2 x86_64, filename includes release date
|
||||
Write-Host "Starting msys2 download using $($msys2Uri.split('/')[-1])"
|
||||
$msys2File = Start-DownloadWithRetry -Url $msys2Uri
|
||||
Write-Host "Finished download"
|
||||
|
||||
# nix style path for tar
|
||||
$msys2FileU = "/$msys2File".replace(':', '').replace('\', '/')
|
||||
|
||||
# Git tar needs exe's from mingw64\bin
|
||||
$env:PATH = "$gitPath\usr\bin;$gitPath\mingw64\bin;$origPath"
|
||||
|
||||
$tar = "$gitPath\usr\bin\tar.exe"
|
||||
|
||||
# extract tar.xz to C:\
|
||||
Write-Host "Starting msys2 extraction"
|
||||
& $msys2File -y -oC:\
|
||||
&$tar -xJf $msys2FileU -C /c/
|
||||
Remove-Item $msys2File
|
||||
Write-Host "Finished extraction"
|
||||
|
||||
# Add msys2 bin tools folders to PATH temporary
|
||||
$env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$env:PATH"
|
||||
$env:PATH = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;$origPath"
|
||||
|
||||
Write-Host "`n$dash bash pacman-key --init"
|
||||
bash.exe -c "pacman-key --init 2>&1"
|
||||
@@ -57,10 +73,6 @@ Write-Host "`n$dash Install mingw32 packages"
|
||||
$pre = "mingw-w64-i686-"
|
||||
pacman.exe -S --noconfirm --needed --noprogressbar $tools32.replace('___', $pre).split(' ')
|
||||
|
||||
# install openssh
|
||||
Write-Host "`n$dash Install openssh package"
|
||||
pacman.exe -S --noconfirm --needed --noprogressbar openssh
|
||||
|
||||
# clean all packages to decrease image size
|
||||
Write-Host "`n$dash Clean packages"
|
||||
pacman.exe -Scc --noconfirm
|
||||
@@ -76,23 +88,4 @@ pacman.exe -Q | grep -v ^mingw-w64-
|
||||
|
||||
Write-Host "`nMSYS2 installation completed"
|
||||
|
||||
# Environment
|
||||
# add C:\msys64\mingw64\bin and C:\msys64\usr\bin to PATH
|
||||
# C:\msys64\mingw64\bin add after C:\Windows\System32 to not replace built-in tar.exe
|
||||
$regEnvKey = 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\'
|
||||
$pathValue = Get-ItemPropertyValue -Path $regEnvKey -Name 'Path'
|
||||
$pathValue += ";C:\msys64\mingw64\bin;C:\msys64\usr\bin"
|
||||
Set-ItemProperty -Path $regEnvKey -Name 'Path' -Value $pathValue
|
||||
|
||||
# Add well-known SSH host keys to ssh_known_hosts to Msys2
|
||||
ssh-keyscan -t rsa github.com >> "C:\msys64\etc\ssh\ssh_known_hosts"
|
||||
ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\msys64\etc\ssh\ssh_known_hosts"
|
||||
|
||||
# Add well-known SSH host keys to ssh_known_hosts to Git
|
||||
if (Test-Path "C:\Program Files\Git\etc\ssh")
|
||||
{
|
||||
ssh-keyscan -t rsa github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
|
||||
ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"
|
||||
}
|
||||
|
||||
Invoke-PesterTests -TestFile "MSYS2"
|
||||
|
||||
Reference in New Issue
Block a user