Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ E.g., `8.10` will be resolved to `8.10.7`, and so will `8`.

- `latest-nightly` (requires the resp. `ghcup-release-channel`, e.g. `https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml`)
- `latest` (default)
- `9.12.2` `9.12`
- `9.14.1` `9.14`
- `9.12.3` `9.12`
- `9.12.2`
- `9.12.1`
- `9.10.3` `9.10`
- `9.10.2`
Expand Down Expand Up @@ -136,7 +138,8 @@ Suggestion: Try to support at least the three latest major versions of GHC.

- `head` (the [cabal-head](https://github.com/haskell/cabal/releases/tag/cabal-head) release of the most recent build of the `master` branch)
- `latest` (default, recommended)
- `3.16.0.0` `3.16`
- `3.16.1.0` `3.16`
- `3.16.0.0`
- `3.14.2.0` `3.14`
- `3.14.1.1`
- `3.14.1.0`
Expand Down
10 changes: 7 additions & 3 deletions dist/index.js

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

2 changes: 1 addition & 1 deletion lib/installer.d.ts

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

2 changes: 1 addition & 1 deletion lib/installer.js

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

6 changes: 5 additions & 1 deletion lib/setup-haskell.js

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

3 changes: 3 additions & 0 deletions lib/versions.json

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

4 changes: 2 additions & 2 deletions src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -354,13 +354,13 @@ async function ghcupBin(os: OS, arch: Arch): Promise<string> {
}

export async function addGhcupReleaseChannel(
channel: URL,
channel: string,
os: OS,
arch: Arch
): Promise<void> {
core.info(`Adding ghcup release channel: ${channel}`);
const bin = await ghcupBin(os, arch);
await exec(bin, ['config', 'add-release-channel', channel.toString()]);
await exec(bin, ['config', 'add-release-channel', channel]);
}

async function ghcup(
Expand Down
7 changes: 6 additions & 1 deletion src/setup-haskell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,14 @@ export default async function run(
core.debug(`run: os = ${JSON.stringify(os)}`);
core.debug(`run: opts = ${JSON.stringify(opts)}`);

// Andreas Abel, 2026-01-01, https://github.com/haskell-actions/setup/issues/78
// Add ghcup vanilla and prereleases channels by default.
addGhcupReleaseChannel('vanilla', os, arch);
addGhcupReleaseChannel('prereleases', os, arch);

if (opts.ghcup.releaseChannel) {
await core.group(`Preparing ghcup environment`, async () =>
addGhcupReleaseChannel(opts.ghcup.releaseChannel!, os, arch)
addGhcupReleaseChannel(opts.ghcup.releaseChannel!.toString(), os, arch)
);
}

Expand Down
3 changes: 3 additions & 0 deletions src/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"ghc": [
"9.14.1",
"9.12.3",
"9.12.2",
"9.12.1",
"9.10.3",
Expand Down Expand Up @@ -58,6 +60,7 @@
"7.10.3"
],
"cabal": [
"3.16.1.0",
"3.16.0.0",
"3.14.2.0",
"3.14.1.1",
Expand Down
Loading