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

Initialize ChocolateyToolsLocation variable and fix tests (#2874)

Browse Source
This commit is contained in:
Mikhail Timofeev
2021-03-08 22:43:58 +03:00
committed by GitHub
parent 5ad9793f29
commit 8cdcef0d00
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,12 @@ ForEach ($version in $VersionsList)
$DefaultGhcVersion = $VersionsList | Select-Object -Last 1
$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3)
$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin"
# Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib
if ($ghcVersion -notmatch "^[0-8]\.\d+.*")
{
$DefaultGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$DefaultGhcShortVersion\bin"
}
Add-MachinePathItem -PathItem $DefaultGhcPath
Write-Host "Installing cabal..."