Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:

defaults:
run:
shell: bash
working-directory: setup

jobs:
Expand Down Expand Up @@ -129,6 +130,12 @@ jobs:
ghc: "9.4.5"
cabal: "3.8"

# Test GHC 9.4.4 on windows (Issue #245)
- os: windows-latest
plan:
ghc: "9.4.4"
cabal: "3.10.1.0"

steps:
- uses: actions/checkout@v3

Expand All @@ -139,10 +146,11 @@ jobs:
cabal-version: ${{ matrix.plan.cabal }}
cabal-update: ${{ matrix.cabal_update }}

- name: Show installed versions
- name: Show installed versions and PATH
run: |
cabal --version
ghc --version
echo "$PATH"

- name: Test runghc
run: |
Expand Down
8 changes: 7 additions & 1 deletion setup/dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion setup/lib/installer.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion setup/src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,13 @@ async function isInstalled(
tool,
version
]);
if (ghcupSetResult == 0)
if (ghcupSetResult == 0) {
return success(tool, version, installedPath, os);
} else {
// Andreas, 2023-05-03, issue #245.
// Since we do not have the correct version, disable any default version.
await exec(await ghcupBin(os), ['unset', tool]);
}
} else {
// Install methods apt and choco have precise install paths,
// so if the install path is present, the tool should be present, too.
Expand Down