diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 41306c74..ad8bafb6 100644 --- 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 index 9e78b77b..820d6f3b 100644 --- a/setup/dist/index.js +++ b/setup/dist/index.js @@ -11253,6 +11253,7 @@ async function isInstalled(tool, version, os) { .then(() => ghcupPath) .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); } diff --git a/setup/src/installer.ts b/setup/src/installer.ts index 14f48758..a1ec683a 100644 --- 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); }