Always try to install cabal

haskell · Dec 21, 2020 · 208fb99 · 208fb99
1 parent 66349f3
commit 208fb99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -58,6 +58,10 @@ jobs:
             expect-fail: true
     steps:
       - uses: actions/checkout@v2
+      - name: Insecure curl
+        if: ${{ matrix.os == 'macOS-latest' && matrix.cabal == '3.4.0.0-rc4' }}
+        shell: bash
+        run: echo insecure >> $HOME/.curlrc
       - uses: ./setup
         continue-on-error: ${{ matrix.expect-fail }}
         with:

diff --git a/setup/dist/index.js b/setup/dist/index.js
diff --git a/setup/src/installer.ts b/setup/src/installer.ts
@@ -116,6 +116,7 @@ async function isInstalled(
       .catch(() => undefined);
 
     if (installedPath) {
+      await exec(await ghcupBin(os), ['install', tool, version]);
       await exec(await ghcupBin(os), ['set', tool, version]);
       return success(tool, version, installedPath, os);
     }