Skip to content

Commit 5757174

Browse files
committed
Move all ghcup-add-channel commands into same group
1 parent ca45ec3 commit 5757174

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

dist/index.js

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

lib/setup-haskell.js

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

src/setup-haskell.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +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-
48-
if (opts.ghcup.releaseChannel) {
49-
await core.group(`Preparing ghcup environment`, async () =>
50-
addGhcupReleaseChannel(opts.ghcup.releaseChannel!.toString(), os, arch)
51-
);
52-
}
43+
await core.group(`Preparing ghcup environment`, async () => {
44+
// Andreas Abel, 2026-01-01, https://github.com/haskell-actions/setup/issues/78
45+
// Add ghcup vanilla and prereleases channels by default.
46+
addGhcupReleaseChannel('vanilla', os, arch);
47+
addGhcupReleaseChannel('prereleases', os, arch);
48+
if (opts.ghcup.releaseChannel)
49+
addGhcupReleaseChannel(opts.ghcup.releaseChannel.toString(), os, arch);
50+
});
5351

5452
for (const [t, {resolved}] of Object.entries(opts).filter(
5553
o => o[1].enable

0 commit comments

Comments
 (0)