actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +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

4
images/win/scripts/Installers/Initialize-VM.ps1
View File

@@ -132,6 +132,10 @@ if (Test-IsWin19) {
Choco-Install -PackageName vcredist2010 Choco-Install -PackageName vcredist2010
} }
# Initialize environmental variable ChocolateyToolsLocation by invoking choco Get-ToolsLocation function
Import-Module "$env:ChocolateyInstall\helpers\chocolateyInstaller.psm1" -Force
Get-ToolsLocation
# Expand disk size of OS drive # Expand disk size of OS drive
$driveLetter = "C" $driveLetter = "C"
$size = Get-PartitionSupportedSize -DriveLetter $driveLetter $size = Get-PartitionSupportedSize -DriveLetter $driveLetter

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

@@ -19,6 +19,12 @@ ForEach ($version in $VersionsList)
$DefaultGhcVersion = $VersionsList | Select-Object -Last 1 $DefaultGhcVersion = $VersionsList | Select-Object -Last 1
$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3) $DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3)
$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin" $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 Add-MachinePathItem -PathItem $DefaultGhcPath
Write-Host "Installing cabal..." Write-Host "Installing cabal..."

8
images/win/scripts/Tests/Haskell.Tests.ps1
View File

@@ -11,10 +11,16 @@ Describe "Haskell" {
$ghcTestCases = $ghcVersionList | ForEach-Object { $ghcTestCases = $ghcVersionList | ForEach-Object {
$ghcVersion = $_ $ghcVersion = $_
$ghcShortVersion = ([version]$ghcVersion).ToString(3) $ghcShortVersion = ([version]$ghcVersion).ToString(3)
$binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe"
# Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib
if ($ghcVersion -notmatch "^[0-8]\.\d+.*")
{
$binGhcPath = Join-Path $env:ChocolateyToolsLocation "ghc-$ghcShortVersion\bin\ghc.exe"
}
@{ @{
ghcVersion = $ghcVersion ghcVersion = $ghcVersion
ghcShortVersion = $ghcShortVersion ghcShortVersion = $ghcShortVersion
binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe" binGhcPath = $binGhcPath
} }
} }