Skip to content
This repository has been archived by the owner on Jan 5, 2024. It is now read-only.

Commit

Permalink
Fallback to ghcup on windows (#206)
Browse files Browse the repository at this point in the history
If choco installation fails, ghcup will now be tried on Windows.
Also: looks for pre-installed GHCs by trying to `set` them through `ghcup`.

Some commit headings that went into the squash:
* Use ghcup from PATH on windows
* Detect failure of `ghcup set` in isInstalled
* Ensure cabal `install-method: copy` on Windows

---------

Co-authored-by: Zubin Duggal <zubin.duggal@gmail.com>
Co-authored-by: Finley McIlwaine <finleymcilwaine@gmail.com>
  • Loading branch information
3 people committed May 1, 2023
1 parent 297e570 commit b9ef230
Show file tree
Hide file tree
Showing 9 changed files with 282 additions and 67 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ jobs:
ghc: "9.2.5"
cabal: "3.6"

# Test ghcup on windows (PR #206) which choco does not have 9.4.5
- os: windows-latest
plan:
ghc: "9.4.5"
cabal: "3.8"

steps:
- uses: actions/checkout@v3

Expand Down
103 changes: 83 additions & 20 deletions setup/dist/index.js

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

61 changes: 43 additions & 18 deletions setup/lib/installer.js

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

28 changes: 28 additions & 0 deletions setup/lib/opts.d.ts

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

28 changes: 28 additions & 0 deletions setup/lib/opts.js

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

14 changes: 12 additions & 2 deletions setup/lib/setup-haskell.js

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

Loading

0 comments on commit b9ef230

Please sign in to comment.