Support latest-nightly

haskell-actions · Jul 3, 2023 · 09d5694 · 09d5694
1 parent 34d70fb
commit 09d5694
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -236,6 +236,7 @@ E.g., `8.10` will be resolved to `8.10.7`, and so will `8`.
 
 **GHC:**
 
+- `latest-nightly`
 - `latest` (default)
 - `9.6.2` `9.6`
 - `9.6.1`

diff --git a/dist/index.js b/dist/index.js
@@ -13400,12 +13400,21 @@ async function installTool(tool, version, os) {
     }
     switch (os) {
         case 'linux':
-            if (tool === 'ghc' && (0, compare_versions_1.compareVersions)('8.3', version)) {
-                // 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.
-                // So, ignore the error.
-                // if (!(await aptLibCurses5())) break;
-                await aptLibNCurses5();
+            if (tool === 'ghc') {
+                if (version === 'latest-nightly') {
+                    await exec(await ghcupBin(os), [
+                        'config',
+                        'add-release-channel',
+                        'https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml'
+                    ]);
+                }
+                else if ((0, compare_versions_1.compareVersions)('8.3', version)) {
+                    // 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.
+                    // So, ignore the error.
+                    // if (!(await aptLibCurses5())) break;
+                    await aptLibNCurses5();
+                }
             }
             await ghcup(tool, version, os);
             if (await isInstalled(tool, version, os))

diff --git a/lib/installer.js b/lib/installer.js
@@ -155,12 +155,21 @@ async function installTool(tool, version, os) {
     }
     switch (os) {
         case 'linux':
-            if (tool === 'ghc' && (0, compare_versions_1.compareVersions)('8.3', version)) {
-                // 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.
-                // So, ignore the error.
-                // if (!(await aptLibCurses5())) break;
-                await aptLibNCurses5();
+            if (tool === 'ghc') {
+                if (version === 'latest-nightly') {
+                    await exec(await ghcupBin(os), [
+                        'config',
+                        'add-release-channel',
+                        'https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml'
+                    ]);
+                }
+                else if ((0, compare_versions_1.compareVersions)('8.3', version)) {
+                    // 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.
+                    // So, ignore the error.
+                    // if (!(await aptLibCurses5())) break;
+                    await aptLibNCurses5();
+                }
             }
             await ghcup(tool, version, os);
             if (await isInstalled(tool, version, os))

diff --git a/src/installer.ts b/src/installer.ts
@@ -165,12 +165,20 @@ export async function installTool(
 
   switch (os) {
     case 'linux':
-      if (tool === 'ghc' && compareVersions('8.3', version)) {
-        // 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.
-        // So, ignore the error.
-        // if (!(await aptLibCurses5())) break;
-        await aptLibNCurses5();
+      if (tool === 'ghc') {
+        if (version === 'latest-nightly') {
+          await exec(await ghcupBin(os), [
+            'config',
+            'add-release-channel',
+            'https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml'
+          ]);
+        } else if (compareVersions('8.3', version)) {
+          // 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.
+          // So, ignore the error.
+          // if (!(await aptLibCurses5())) break;
+          await aptLibNCurses5();
+        }
       }
       await ghcup(tool, version, os);
       if (await isInstalled(tool, version, os)) return;