Skip to content

Commit 9fc7880

Browse files
committed
Add cabal-3.12.1.0 (requires cabal update always)
1 parent 2700fc9 commit 9fc7880

File tree

5 files changed

+25
-27
lines changed

5 files changed

+25
-27
lines changed

.github/workflows/workflow.yml

+15-20
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,32 @@ jobs:
4949
# Latest releases
5050
- ghc: latest
5151
cabal: latest
52+
cabal_update: "true"
53+
# cabal-3.12 build always needs a repo, so, `cabal update` is mandatory
5254

5355
# Latest ghc with cabal head
5456
- ghc: latest
5557
cabal: head
58+
cabal_update: "true"
5659

5760
# Recent releases
5861

62+
- ghc: "9.8"
63+
cabal: "3.10"
64+
cabal_update: "false"
65+
5966
- ghc: "9.6"
6067
cabal: "3.10"
68+
cabal_update: "true"
69+
# Test #210 (XDG): is the cabal store-dir set to something meaningful?
6170

6271
- ghc: "9.4"
6372
cabal: "3.8"
73+
cabal_update: "false"
6474

6575
- ghc: "9.2"
6676
cabal: "3.6"
67-
68-
cabal_update: ["false"]
77+
cabal_update: "false"
6978

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

@@ -95,29 +104,15 @@ jobs:
95104
plan:
96105
ghc: "8.6"
97106
cabal: "2.4"
98-
cabal_update: "true"
107+
cabal_update: "true"
99108
# cabal update needed here since cabal-2.4 is still v1
100109

101-
# Test #210 (XDG): is the cabal store-dir set to something meaningful?
102-
- os: ubuntu-latest
103-
plan:
104-
ghc: "9.6"
105-
cabal: "3.10"
106-
cabal_update: "true"
107-
108-
# With choco, cabal 3.10.1.0 should map to 3.10.1.1
109-
- os: windows-latest
110-
plan:
111-
ghc: "9.6"
112-
cabal: "3.10"
113-
cabal_update: "true"
114-
115110
# Test some old versions
116111
- os: ubuntu-latest
117112
plan:
118113
ghc: "8.2.2"
119114
cabal: "2.4.1.0"
120-
cabal_update: "false"
115+
cabal_update: "false"
121116

122117
# Test ghcup pre-release channel
123118
- os: ubuntu-latest
@@ -188,7 +183,7 @@ jobs:
188183
ghc-version: ${{ matrix.plan.ghc }}
189184
ghcup-release-channel: ${{ matrix.ghcup_release_channel }}
190185
cabal-version: ${{ matrix.plan.cabal }}
191-
cabal-update: ${{ matrix.cabal_update }}
186+
cabal-update: ${{ matrix.plan.cabal_update }}
192187

193188
- name: Show installed versions and PATH
194189
run: |
@@ -248,7 +243,7 @@ jobs:
248243
# This tests whether the default installdir has been added to the PATH (issue #130).
249244

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

README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ If you need multiple versions of GHC installed at the same time, it is possible
106106
to run the action twice.
107107
108108
```yaml
109-
- uses: haskell-actions/setup@v2
110-
with:
111-
ghc-version: '9.8.2'
109+
- uses: haskell-actions/setup@v2
110+
with:
111+
ghc-version: '9.8.2'
112112

113-
- uses: haskell-actions/setup@v2
114-
with:
115-
ghc-version: '8.10.7'
113+
- uses: haskell-actions/setup@v2
114+
with:
115+
ghc-version: '8.10.7'
116116
```
117117
118118
### Model cabal workflow with caching
@@ -315,6 +315,7 @@ Suggestion: Try to support at least the three latest major versions of GHC.
315315

316316
- `head` (the [cabal-head](https://github.com/haskell/cabal/releases/tag/cabal-head) release of the most recent build of the `master` branch)
317317
- `latest` (default, recommended)
318+
- `3.12.1.0` `3.12`
318319
- `3.10.3.0` `3.10`
319320
- `3.10.2.1`
320321
- `3.10.2.0`

dist/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/versions.json

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/versions.json

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"7.10.3"
5252
],
5353
"cabal": [
54+
"3.12.1.0",
5455
"3.10.3.0",
5556
"3.10.2.1",
5657
"3.10.2.0",

0 commit comments

Comments
 (0)