Skip to content

Commit eb29c23

Browse files
committed
Use GHCup vanilla and prereleases channels by default
1 parent 243ff44 commit eb29c23

File tree

6 files changed

+21
-8
lines changed

6 files changed

+21
-8
lines changed

dist/index.js

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/installer.d.ts

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/installer.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/setup-haskell.js

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/installer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,13 @@ async function ghcupBin(os: OS, arch: Arch): Promise<string> {
354354
}
355355

356356
export async function addGhcupReleaseChannel(
357-
channel: URL,
357+
channel: string,
358358
os: OS,
359359
arch: Arch
360360
): Promise<void> {
361361
core.info(`Adding ghcup release channel: ${channel}`);
362362
const bin = await ghcupBin(os, arch);
363-
await exec(bin, ['config', 'add-release-channel', channel.toString()]);
363+
await exec(bin, ['config', 'add-release-channel', channel]);
364364
}
365365

366366
async function ghcup(

src/setup-haskell.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,14 @@ export default async function run(
4040
core.debug(`run: os = ${JSON.stringify(os)}`);
4141
core.debug(`run: opts = ${JSON.stringify(opts)}`);
4242

43+
// Andreas Abel, 2026-01-01, https://github.com/haskell-actions/setup/issues/78
44+
// Add ghcup vanilla and prereleases channels by default.
45+
addGhcupReleaseChannel('vanilla', os, arch);
46+
addGhcupReleaseChannel('prereleases', os, arch);
47+
4348
if (opts.ghcup.releaseChannel) {
4449
await core.group(`Preparing ghcup environment`, async () =>
45-
addGhcupReleaseChannel(opts.ghcup.releaseChannel!, os, arch)
50+
addGhcupReleaseChannel(opts.ghcup.releaseChannel!.toString(), os, arch)
4651
);
4752
}
4853

0 commit comments

Comments
 (0)