Skip to content

Fix #117 and add GHC 9.6.7 and Stack 3.5.1 #118

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

Merged
merged 2 commits into from
Apr 10, 2025
Merged

Fix #117 and add GHC 9.6.7 and Stack 3.5.1 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b2444f
Add GHC 9.6.7 and Stack 3.5.1 and bump GHCup to 0.1.50.1
andreasabel Apr 10, 2025
64445b6
Fix #117: conditional to only install libtinfo5 etc for ghc < 8.3
andreasabel Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ E.g., `8.10` will be resolved to `8.10.7`, and so will `8`.
- `9.8.4` `9.8`
- `9.8.2`
- `9.8.1`
- `9.6.6` `9.6`
- `9.6.7` `9.6`
- `9.6.6`
- `9.6.5`
- `9.6.4`
- `9.6.3`
Expand Down Expand Up @@ -156,6 +157,7 @@ Recommendation: Use the latest available version if possible.
**Stack:** (with `enable-stack: true`)

- `latest` (default, recommended)
- `3.5.1` `3.5`
- `3.3.1` `3.3`
- `3.1.1` `3.1`
- `2.15.7` `2.15`
Expand Down
6 changes: 4 additions & 2 deletions dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion lib/installer.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion lib/versions.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ export async function installTool(
// so guard “compareVersions” with “validate”.
if (
tool === 'ghc' &&
(!validate(version) || compareVersions('8.3', version))
validate(version) &&
compareVersions(version, '8.3') < 0 // meaning version < 8.3
) {
// Andreas, 2022-12-09: The following errors out if we are not ubuntu-20.04.
// Atm, I do not know how to check whether we are on ubuntu-20.04.
Expand Down
4 changes: 3 additions & 1 deletion src/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"9.8.4",
"9.8.2",
"9.8.1",
"9.6.7",
"9.6.6",
"9.6.5",
"9.6.4",
Expand Down Expand Up @@ -72,6 +73,7 @@
"2.4.1.0"
],
"stack": [
"3.5.1",
"3.3.1",
"3.1.1",
"2.15.7",
Expand Down Expand Up @@ -103,5 +105,5 @@
"1.3.0",
"1.2.0"
],
"ghcup": ["0.1.40.0"]
"ghcup": ["0.1.50.1"]
}
Loading