Skip to content

Commit f55bc66

Browse files
authored
Add support for GHC 9.12, drop support for GHC 9.6 (#43)
* Add support for GHC 9.12, drop support for GHC 9.6 * Update CI workflow for Ubuntu 24.04 * Remove redundant GHC version check for annotations
1 parent 3470197 commit f55bc66

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.github/workflows/ci.yml

+13-12
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ jobs:
55
steps:
66
- uses: actions/checkout@v4
77
- run: mkdir artifact
8-
- id: haskell
9-
uses: haskell-actions/setup@v2
8+
- uses: haskell/ghcup-setup@v1
109
with:
11-
ghc-version: ${{ matrix.ghc }}
10+
ghc: ${{ matrix.ghc }}
11+
cabal: latest
1212
- run: ghc-pkg list
1313
- run: cabal sdist --output-dir artifact
1414
- run: cabal configure --enable-tests --flags=pedantic --jobs
1515
- run: cat cabal.project.local
1616
- run: cp cabal.project.local artifact
17+
- run: cabal update
1718
- run: cabal freeze
1819
- run: cat cabal.project.freeze
1920
- run: cp cabal.project.freeze artifact
2021
- run: cabal outdated --v2-freeze-file
2122
- uses: actions/cache@v4
2223
with:
2324
key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
24-
path: ${{ steps.haskell.outputs.cabal-store }}
25+
path: ~/.local/state/cabal
2526
restore-keys: ${{ matrix.os }}-${{ matrix.ghc }}-
2627
- run: cabal build --only-download
2728
- run: cabal build --only-dependencies
@@ -35,17 +36,17 @@ jobs:
3536
strategy:
3637
matrix:
3738
include:
38-
- ghc: '9.10'
39+
- ghc: 9.12
3940
os: macos-13
40-
- ghc: '9.10'
41+
- ghc: 9.12
4142
os: macos-14
42-
- ghc: 9.6
43-
os: ubuntu-22.04
4443
- ghc: 9.8
45-
os: ubuntu-22.04
46-
- ghc: '9.10'
47-
os: ubuntu-22.04
44+
os: ubuntu-24.04
4845
- ghc: '9.10'
46+
os: ubuntu-24.04
47+
- ghc: 9.12
48+
os: ubuntu-24.04
49+
- ghc: 9.12
4950
os: windows-2022
5051
cabal:
5152
name: Cabal
@@ -85,7 +86,7 @@ jobs:
8586
steps:
8687
- uses: actions/download-artifact@v4
8788
with:
88-
name: burrito-${{ github.sha }}-ubuntu-22.04-9.10
89+
name: burrito-${{ github.sha }}-ubuntu-24.04-9.12
8990
- run: tar --extract --file artifact.tar --verbose
9091
- uses: softprops/action-gh-release@v2
9192
with:

burrito.cabal

+3-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ flag pedantic
3838
manual: True
3939

4040
common library
41-
build-depends: base ^>=4.18.0.0 || ^>=4.19.0.0 || ^>=4.20.0.0
41+
build-depends: base ^>=4.19.0.0 || ^>=4.20.0.0 || ^>=4.21.0.0
4242
default-language: Haskell2010
4343
ghc-options:
4444
-Weverything
@@ -48,6 +48,7 @@ common library
4848
-Wno-missing-deriving-strategies
4949
-Wno-missing-exported-signatures
5050
-Wno-missing-kind-signatures
51+
-Wno-missing-role-annotations
5152
-Wno-missing-safe-haskell-mode
5253
-Wno-prepositive-qualified-module
5354
-Wno-safe
@@ -56,9 +57,6 @@ common library
5657
if flag(pedantic)
5758
ghc-options: -Werror
5859

59-
if impl(ghc >=9.8)
60-
ghc-options: -Wno-missing-role-annotations
61-
6260
common executable
6361
import: library
6462
build-depends: burrito
@@ -72,7 +70,7 @@ library
7270
bytestring ^>=0.11.4.0 || ^>=0.12.0.2,
7371
containers ^>=0.6.7 || ^>=0.7,
7472
parsec ^>=3.1.16.1,
75-
template-haskell ^>=2.20.0.0 || ^>=2.21.0.0 || ^>=2.22.0.0,
73+
template-haskell ^>=2.21.0.0 || ^>=2.22.0.0 || ^>=2.23.0.0,
7674
text ^>=2.0.2 || ^>=2.1,
7775
transformers ^>=0.6.1.0,
7876

0 commit comments

Comments
 (0)