Skip to content

Commit f683c11

Browse files
committed
Add cabal 3.16.0.0 and stack 3.7.1
1 parent 96f3daf commit f683c11

File tree

6 files changed

+29
-4
lines changed

6 files changed

+29
-4
lines changed

.github/workflows/workflow.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ jobs:
5959

6060
# Recent releases
6161

62+
- ghc: "9.12"
63+
cabal: "3.14"
64+
cabal_update: "true"
65+
6266
- ghc: "9.10"
6367
cabal: "3.12"
6468
cabal_update: "true"
@@ -84,6 +88,14 @@ jobs:
8488

8589
include:
8690

91+
# Future macos
92+
93+
- os: macos-15
94+
plan:
95+
ghc: latest
96+
cabal: latest
97+
cabal_update: "true"
98+
8799
# Some previously recommended releases of ghc with matching cabal
88100

89101
- os: macos-13
@@ -136,14 +148,15 @@ jobs:
136148

137149
# Test ghcup pre-release channel
138150
- os: ubuntu-latest
139-
ghcup_release_channel: "https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml"
151+
ghcup_release_channel: "https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.9.yaml"
140152
plan:
141153
ghc: "9.6.0.20230111"
142154
cabal: "3.8"
143155

144156
# Test ghc nightly
145157
- os: ubuntu-latest
146158
ghcup_release_channel: "https://ghc.gitlab.haskell.org/ghcup-metadata/ghcup-nightlies-0.0.7.yaml"
159+
# 2025-07-29: 0.0.8 and 0.0.9 do not exist
147160
plan:
148161
ghc: "latest-nightly"
149162
cabal: "latest"
@@ -306,7 +319,7 @@ jobs:
306319
fail-fast: false
307320
matrix:
308321
os: [ubuntu-latest, macOS-latest, windows-latest]
309-
stack: ["latest", "2.15.5"]
322+
stack: ["latest", "3.3.1"]
310323
# test latest and recommended version of stack
311324

312325
steps:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ E.g., `8.10` will be resolved to `8.10.7`, and so will `8`.
128128
- `8.4.1`
129129
- `8.2.2` `8.2`
130130
- `8.0.2` `8.0`
131-
- `7.10.3` `7.10` (deprecated, not on `ubuntu-22.04` or up)
132131

133132
Suggestion: Try to support at least the three latest major versions of GHC.
134133

135134
**Cabal:**
136135

137136
- `head` (the [cabal-head](https://github.com/haskell/cabal/releases/tag/cabal-head) release of the most recent build of the `master` branch)
138137
- `latest` (default, recommended)
138+
- `3.16.0.0` `3.16`
139139
- `3.14.2.0` `3.14`
140140
- `3.14.1.1`
141141
- `3.14.1.0`
@@ -158,6 +158,7 @@ Recommendation: Use the latest available version if possible.
158158
**Stack:** (with `enable-stack: true`)
159159

160160
- `latest` (default, recommended)
161+
- `3.7.1` `3.7`
161162
- `3.5.1` `3.5`
162163
- `3.3.1` `3.3`
163164
- `3.1.1` `3.1`

dist/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/contributors.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,10 @@ Finally, it will make sure these changes are appropriately included in your comm
3232
Cabal does not follow SemVer and Stack has both SemVer compatible version numbers as well as PVP-style versions; due to this, support for "resolving" a version like `X.X` into the latest `X.X.Y` or `X.X.Y.Y` version is tricky.
3333
To avoid complications, all recognized versions of GHC, Cabal, and Stack are in `src/versions.json`; these versions are supported across all three operating systems.
3434
When a new release of GHC, Cabal, or Stack comes out, the `src/versions.json` file will need to be updated accordingly.
35+
36+
### Adding new versions
37+
38+
- Add new versions to `src/versions.json` and `README.md`.
39+
- Take a look at `.github/workflows/workflow.yml`.
40+
The new versions should be covered by the `latest` jobs there, however they can bump the next-to-latest versions out of CI.
41+
Make sure all recent versions are covered by the CI.

lib/versions.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/versions.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"7.10.3"
5858
],
5959
"cabal": [
60+
"3.16.0.0",
6061
"3.14.2.0",
6162
"3.14.1.1",
6263
"3.14.1.0",
@@ -75,6 +76,7 @@
7576
"2.4.1.0"
7677
],
7778
"stack": [
79+
"3.7.1",
7880
"3.5.1",
7981
"3.3.1",
8082
"3.1.1",

0 commit comments

Comments
 (0)