Skip to content

Commit f57f3ec

Browse files
Update GHC versions on CI
2 parents 61ddf37 + 89e6c9b commit f57f3ec

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

.github/workflows/cabal.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,18 @@ jobs:
2020
strategy:
2121
matrix:
2222
plan:
23-
# - { ghc: "8.2.2", cabal: "2.4.0.1" }
24-
- { ghc: "8.4.4", cabal: "2.4.0.1" }
25-
- { ghc: "8.6.5", cabal: "2.4.0.1" }
26-
- { ghc: "8.8.3", cabal: "3.0.1" }
27-
- { ghc: "8.10.1", cabal: "3.2" }
23+
- { ghc: "8.10.4" }
24+
- { ghc: "9.2.4" }
2825
env:
2926
CONFIG: "--enable-tests --enable-benchmarks"
3027
steps:
3128
- uses: actions/checkout@v2
3229
with:
3330
submodules: true
34-
- uses: haskell/actions/setup@v1
31+
- uses: haskell/actions/setup@v2
3532
id: setup-haskell-cabal
3633
with:
3734
ghc-version: ${{ matrix.plan.ghc }}
38-
cabal-version: ${{ matrix.plan.cabal }}
3935
- run: cabal v2-update
4036
- run: cabal v2-freeze $CONFIG
4137
- uses: actions/cache@v2
@@ -47,4 +43,4 @@ jobs:
4743
restore-keys: |
4844
${{ runner.os }}-${{ matrix.plan.ghc }}-
4945
- run: cabal v2-build $CONFIG
50-
- run: cabal v2-test $CONFIG
46+
- run: cabal v2-test $CONFIG

.github/workflows/stack.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ jobs:
3838
os: [ubuntu-latest, macOS-latest]
3939
# use this to specify what resolvers and ghc to use
4040
plan:
41-
# - { resolver: "--resolver lts-9" } # ghc-8.0.2
42-
# - { resolver: "--resolver lts-11" } # ghc-8.2.2
43-
# - { resolver: "--resolver lts-12" } # ghc-8.4.4
44-
- { resolver: "--resolver lts-14" } # ghc-8.6.5
45-
- { resolver: "--resolver lts-16" }
41+
- { resolver: "--resolver lts-18" } # ghc-8.10
42+
- { resolver: "--resolver lts-20" } # ghc-9.2
4643
- { resolver: "--resolver nightly" }
4744
# - { resolver: "" }
4845
# use this to include any dependencies from OS package managers
@@ -74,4 +71,4 @@ jobs:
7471
run: |
7572
stack --no-terminal $ARGS test --bench --no-run-benchmarks
7673
env:
77-
ARGS: ${{ matrix.plan.resolver }}
74+
ARGS: ${{ matrix.plan.resolver }}

0 commit comments

Comments
 (0)