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

[Windows] Remove pester test for kotlinc-js (#6850)

Browse Source
This commit is contained in:
Alexey-Ayupov
2022-12-29 20:39:24 +01:00
committed by GitHub
parent e9b59a540e
commit 39ba239618
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,20 +13,13 @@ $VersionsList = $LatestMajorMinor | ForEach-Object { $_.Group | Select-Object -F
# The latest version will be installed as a default # The latest version will be installed as a default
ForEach ($version in $VersionsList) ForEach ($version in $VersionsList)
{ {
# 9.4.3 has failed choco builds, replace with 9.4.2 for the time being
# 9.2.5 has failed choco builds, replace with 9.2.4 for the time being
if ($version -eq "9.4.3"){ [version]$version = "9.4.2" }
if ($version -eq "9.2.5"){ [version]$version = "9.2.4" }
Write-Host "Installing ghc $version..." Write-Host "Installing ghc $version..."
Choco-Install -PackageName ghc -ArgumentList '--version', $version, '-m' Choco-Install -PackageName ghc -ArgumentList '--version', $version, '-m'
} }
# 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
# temporary hardcode ------------- $DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3)
#$DefaultGhcShortVersion = ([version]$DefaultGhcVersion).ToString(3)
$DefaultGhcShortVersion = "9.4.2"
#--------------------------------
$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 # Starting from version 9 haskell installation directory is $env:ChocolateyToolsLocation instead of $env:ChocolateyInstall\lib
if ($DefaultGhcShortVersion -notmatch '^[0-8]\.\d+.*') if ($DefaultGhcShortVersion -notmatch '^[0-8]\.\d+.*')

2
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -183,7 +183,7 @@ Describe "Pipx" {
} }
Describe "Kotlin" { Describe "Kotlin" {
$kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-js", "kotlinc-jvm") $kotlinPackages = @("kapt", "kotlin", "kotlinc", "kotlin-dce-js", "kotlinc-jvm")
It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) { It "<toolName> is available" -TestCases ($kotlinPackages | ForEach-Object { @{ toolName = $_ } }) {
"$toolName -version" | Should -ReturnZeroExitCode "$toolName -version" | Should -ReturnZeroExitCode