Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose ghcup binary to PATH on windows #4264

Merged
merged 10 commits into from
Dec 10, 2021
Merged

Expose ghcup binary to PATH on windows #4264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8b1ede4
Expose ghcup binary to PATH on windows
hasufell Oct 12, 2021
7a0460b
Set CABAL_DIR and make sure config is adjusted
hasufell Oct 12, 2021
11f1eb0
Expose cabal dir to PATH as well
hasufell Oct 12, 2021
193d22b
Use Set-SystemVariable
hasufell Nov 11, 2021
2eb265e
Fix tests
hasufell Nov 11, 2021
a99dc64
Use hardcoded cabal dir
hasufell Nov 29, 2021
e73f4a7
Fix bootstrap-haskell
hasufell Nov 30, 2021
a0fae3f
Move test after installation
hasufell Dec 1, 2021
4a76bc2
Print ghcup installation message
hasufell Dec 1, 2021
354a537
Don't adjust cabal.config (to include mingw paths)
hasufell Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions images/win/scripts/Installers/Install-Haskell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,17 @@ Add-MachinePathItem -PathItem $DefaultGhcPath
Write-Host 'Installing cabal...'
Choco-Install -PackageName cabal

Invoke-PesterTests -TestFile 'Haskell'

# install minimal ghcup, utilizing pre-installed msys2 at C:\msys64
Write-Host 'Installing ghcup...'
$msysPath = "C:\msys64"
$ghcupPrefix = "C:\"
$cabalDir = "C:\cabal"
$bootstrapHaskell = Invoke-WebRequest https://www.haskell.org/ghcup/sh/bootstrap-haskell.ps1 -UseBasicParsing
Invoke-Command -ScriptBlock ([ScriptBlock]::Create($bootstrapHaskell)) -ArgumentList $false, $true, $true, $false, $false, $false, $false, C:\, "", C:\msys64, C:\cabal
Invoke-Command -ScriptBlock ([ScriptBlock]::Create($bootstrapHaskell)) -ArgumentList $false, $true, $true, $false, $true, $false, $false, $ghcupPrefix, "", $msysPath, $cabalDir
Set-SystemVariable "GHCUP_INSTALL_BASE_PREFIX" $ghcupPrefix
Set-SystemVariable "GHCUP_MSYS2" $msysPath
Set-SystemVariable "CABAL_DIR" $cabalDir
Add-MachinePathItem "$ghcupPrefix\ghcup\bin"
Add-MachinePathItem "$cabalDir\bin"

Invoke-PesterTests -TestFile 'Haskell'
20 changes: 19 additions & 1 deletion images/win/scripts/Tests/Haskell.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ Describe "Haskell" {
}
}

$ghcupEnvExists = @(
@{envVar = "GHCUP_INSTALL_BASE_PREFIX"}
@{envVar = "GHCUP_MSYS2"}
)

It "<envVar> environment variable exists" -TestCases $ghcupEnvExists {
Test-Path env:\$envVar
}

It "Accurate 3 versions of GHC are installed" -TestCases @{ghcCount = $ghcCount} {
$ghcCount | Should -BeExactly 3
}
Expand All @@ -39,4 +48,13 @@ Describe "Haskell" {
It "Cabal is installed" {
"cabal --version" | Should -ReturnZeroExitCode
}
}

It "cabal config was modified and exists" {
$env:CABAL_DIR | Should -Exist
"cabal user-config diff" | Should -ReturnZeroExitCode
}

It "ghcup is installed" {
"ghcup --version" | Should -ReturnZeroExitCode
}
}