actions/runner-images
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1839 from miketimofeev/fix-haskell-tests-for-revision-versions

Browse Source 
[windows] Fix Haskell revision version installation and related tests
This commit is contained in:
Maxim Lobanov
2020-10-19 07:49:23 +03:00
committed by GitHub
parent 0fa2247a89 a9b5e80521
commit 941243a186
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/win/scripts/Installers/Install-Haskell.ps1
+2 -1
View File
@@ -17,7 +17,8 @@ ForEach ($version in $VersionsList)
# Add default version of GHC to path, because choco formula updates path on user level # Add default version of GHC to path, because choco formula updates path on user level
$DefaultGhcVersion = $VersionsList | Select-Object -Last 1 $DefaultGhcVersion = $VersionsList | Select-Object -Last 1
$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcVersion\bin" $DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3)
$DefaultGhcPath = Join-Path $env:ChocolateyInstall "lib\ghc.$DefaultGhcVersion\tools\ghc-$DefaultGhcShortVersion\bin"
Add-MachinePathItem -PathItem $DefaultGhcPath Add-MachinePathItem -PathItem $DefaultGhcPath
Write-Host "Installing cabal..." Write-Host "Installing cabal..."
images/win/scripts/Tests/Haskell.Tests.ps1
+10 -4
View File
@@ -3,12 +3,18 @@ Describe "Haskell" {
[array]$ghcVersionList = Get-ChildItem -Path $chocoPackagesPath -Filter "ghc.*" | ForEach-Object { $_.Name.TrimStart("ghc.") } [array]$ghcVersionList = Get-ChildItem -Path $chocoPackagesPath -Filter "ghc.*" | ForEach-Object { $_.Name.TrimStart("ghc.") }
$ghcCount = $ghcVersionList.Count $ghcCount = $ghcVersionList.Count
$defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1 $defaultGhcVersion = $ghcVersionList | Sort-Object {[Version]$_} | Select-Object -Last 1
$ghcDefaultCases = @{
defaultGhcVersion = $defaultGhcVersion
defaultGhcShortVersion = ([version]$defaultGhcVersion).ToString(3)
}
$ghcTestCases = $ghcVersionList | ForEach-Object { $ghcTestCases = $ghcVersionList | ForEach-Object {
$ghcVersion = $_ $ghcVersion = $_
$ghcShortVersion = ([version]$ghcVersion).ToString(3)
@{ @{
ghcVersion = $ghcVersion ghcVersion = $ghcVersion
binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcVersion\bin\ghc.exe" ghcShortVersion = $ghcShortVersion
binGhcPath = Join-Path $chocoPackagesPath "ghc.$ghcVersion\tools\ghc-$ghcShortVersion\bin\ghc.exe"
} }
} }
@@ -17,11 +23,11 @@ Describe "Haskell" {
} }
It "GHC <ghcVersion> is installed" -TestCases $ghcTestCases { It "GHC <ghcVersion> is installed" -TestCases $ghcTestCases {
"$binGhcPath --version" | Should -MatchCommandOutput $ghcVersion "$binGhcPath --version" | Should -MatchCommandOutput $ghcShortVersion
} }
It "GHC <defaultGhcVersion> is the default version and should be the latest installed" -TestCases @{defaultGhcVersion = $defaultGhcVersion} { It "GHC <defaultGhcVersion> is the default version and should be the latest installed" -TestCases $ghcDefaultCases {
"ghc --version" | Should -MatchCommandOutput $defaultGhcVersion "ghc --version" | Should -MatchCommandOutput $defaultGhcShortVersion
} }
It "Cabal is installed" { It "Cabal is installed" {