Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cabal-3.12.1.0 #89

Merged
merged 2 commits into from
Jul 1, 2024
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
38 changes: 18 additions & 20 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,32 @@ jobs:
# Latest releases
- ghc: latest
cabal: latest
cabal_update: "true"
# cabal-3.12 build always needs a repo, so, `cabal update` is mandatory

# Latest ghc with cabal head
- ghc: latest
cabal: head
cabal_update: "true"

# Recent releases

- ghc: "9.8"
cabal: "3.10"
cabal_update: "false"

- ghc: "9.6"
cabal: "3.10"
cabal_update: "true"
# Test #210 (XDG): is the cabal store-dir set to something meaningful?

- ghc: "9.4"
cabal: "3.8"
cabal_update: "false"

- ghc: "9.2"
cabal: "3.6"

cabal_update: ["false"]
cabal_update: "false"

# The following tests do not set 'cabal-update', which defaults to 'true' then.

Expand Down Expand Up @@ -95,29 +104,18 @@ jobs:
plan:
ghc: "8.6"
cabal: "2.4"
cabal_update: "true"
cabal_update: "false"
# Setting cabal_update to "true" will try to build the test project
# with hackage dependencies, but something goes wrong.
# TODO: figure out what.
# cabal update needed here since cabal-2.4 is still v1

# Test #210 (XDG): is the cabal store-dir set to something meaningful?
- os: ubuntu-latest
plan:
ghc: "9.6"
cabal: "3.10"
cabal_update: "true"

# With choco, cabal 3.10.1.0 should map to 3.10.1.1
- os: windows-latest
plan:
ghc: "9.6"
cabal: "3.10"
cabal_update: "true"

# Test some old versions
- os: ubuntu-latest
plan:
ghc: "8.2.2"
cabal: "2.4.1.0"
cabal_update: "false"
cabal_update: "false"

# Test ghcup pre-release channel
- os: ubuntu-latest
Expand Down Expand Up @@ -188,7 +186,7 @@ jobs:
ghc-version: ${{ matrix.plan.ghc }}
ghcup-release-channel: ${{ matrix.ghcup_release_channel }}
cabal-version: ${{ matrix.plan.cabal }}
cabal-update: ${{ matrix.cabal_update }}
cabal-update: ${{ matrix.plan.cabal_update }}

- name: Show installed versions and PATH
run: |
Expand Down Expand Up @@ -248,7 +246,7 @@ jobs:
# This tests whether the default installdir has been added to the PATH (issue #130).

- name: Build and run test with Hackage dependency
if: ${{ matrix.cabal_update != 'false' }}
if: ${{ matrix.plan.cabal_update != 'false' }}
working-directory: __tests__/project-with-hackage-dependency
run: cabal build && cabal run

Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ If you need multiple versions of GHC installed at the same time, it is possible
to run the action twice.

```yaml
- uses: haskell-actions/setup@v2
with:
ghc-version: '9.8.2'
- uses: haskell-actions/setup@v2
with:
ghc-version: '9.8.2'

- uses: haskell-actions/setup@v2
with:
ghc-version: '8.10.7'
- uses: haskell-actions/setup@v2
with:
ghc-version: '8.10.7'
```

### Model cabal workflow with caching
Expand Down Expand Up @@ -315,6 +315,7 @@ Suggestion: Try to support at least the three latest major versions of GHC.

- `head` (the [cabal-head](https://github.com/haskell/cabal/releases/tag/cabal-head) release of the most recent build of the `master` branch)
- `latest` (default, recommended)
- `3.12.1.0` `3.12`
- `3.10.3.0` `3.10`
- `3.10.2.1`
- `3.10.2.0`
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js

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

1 change: 1 addition & 0 deletions lib/versions.json

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

1 change: 1 addition & 0 deletions src/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"7.10.3"
],
"cabal": [
"3.12.1.0",
"3.10.3.0",
"3.10.2.1",
"3.10.2.0",
Expand Down