feat: ability to specify all release channels

haskell · Dec 12, 2024 · 497af3c · 497af3c
1 parent 845f2ba
commit 497af3c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 8 deletions.
diff --git a/.github/workflows/test-ghcup.yaml b/.github/workflows/test-ghcup.yaml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  simple:
     strategy:
       matrix:
         runs-on:
@@ -47,3 +47,30 @@ jobs:
       - run: ghcup whereis hls latest
       - run: which haskell-language-server-wrapper
       - run: haskell-language-server-wrapper --version
+
+  vanilla_channel:
+    strategy:
+      matrix:
+        runs-on:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ./ghcup
+        with:
+          release-channels: |
+            GHCupURL
+            https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/develop/ghcup-vanilla-0.0.8.yaml
+
+      - run: ghcup config
+      - run: ghcup debug-info
+      - run: ghcup tool-requirements
+      - run: ghcup list
+
+      - run: ghcup install ghc latest --set
+      - run: ghcup whereis ghc latest
+      - run: which ghc
+      - run: ghc --version
diff --git a/ghcup/action.yml b/ghcup/action.yml
@@ -9,8 +9,10 @@ inputs:
   version:
     description: Version to install
     default: latest
-  extra-release-channels:
+  release-channels:
     description: Additional release-channels
+    default: |
+      GHCupURL
 
 outputs:
   path:

diff --git a/ghcup/dist/index.js b/ghcup/dist/index.js
diff --git a/ghcup/src/index.ts b/ghcup/src/index.ts
@@ -4,7 +4,7 @@ import core from "@actions/core";
 try {
   main({
     version: core.getInput("version"),
-    extra_release_channels: core.getMultilineInput("extra-release-channels")
+    release_channels: core.getMultilineInput("release-channels")
   })
 } catch (error) {
   core.setFailed((error as Error).message);

diff --git a/ghcup/src/main.ts b/ghcup/src/main.ts
@@ -70,7 +70,7 @@ async function ghcup(version: string) {
 
 export type Opts = {
   version: string,
-  extra_release_channels: string[]
+  release_channels: string[]
 }
 
 export async function main(opts: Opts) {
@@ -87,7 +87,7 @@ export async function main(opts: Opts) {
   core.debug(`ghcup bindir is ${bindir}`)
   core.addPath(bindir);
 
-  for (const channel in opts.extra_release_channels) {
-    await exec.exec(ghcupPath, ['config', 'add-release-channel', channel]);
-  }
+  await exec.exec(ghcupPath, [
+    'config', 'set', 'url-source', `'${JSON.stringify(opts.release_channels)}'`
+  ]);
 }