Skip to content

Commit 52e72a4

Browse files
committed
Allow containers-0.7, bump CI to GHC 9.6.3
1 parent 8248425 commit 52e72a4

6 files changed

Lines changed: 20 additions & 14 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20230911
11+
# version: 0.17.20231002
1212
#
13-
# REGENDATA ("0.17.20230911",["github","hackage-cli.cabal"])
13+
# REGENDATA ("0.17.20231002",["github","hackage-cli.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.0.20230822
35+
- compiler: ghc-9.8.0.20230929
3636
compilerKind: ghc
37-
compilerVersion: 9.8.0.20230822
37+
compilerVersion: 9.8.0.20230929
3838
setup-method: ghcup
3939
allow-failure: true
40-
- compiler: ghc-9.6.2
40+
- compiler: ghc-9.6.3
4141
compilerKind: ghc
42-
compilerVersion: 9.6.2
42+
compilerVersion: 9.6.3
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.4.7

.github/workflows/stack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest]
17-
ghc-ver: [9.6.2, 9.4.6, 9.2.8, 9.0.2, 8.10.7]
17+
ghc-ver: [9.6.3, 9.4.7, 9.2.8, 9.0.2, 8.10.7]
1818
# On ubuntu-22.04 the old versions 8.8.4, 8.6.5, 8.4.4, 8.2.2 fail due to HsOpenSSL linking errors.
1919
# They used to work under ubuntu-20.04, but it is not worth the trouble maintaining them.
2020
# Apparently, HsOpenSSL-0.11.6 and older are too old for ubuntu-22.04.
2121
include:
2222
- os: macos-latest
23-
ghc-ver: 9.6.2
23+
ghc-ver: 9.6.3
2424
- os: windows-latest
25-
ghc-ver: 9.6.2
25+
ghc-ver: 9.6.3
2626
env:
2727
ARGS: "--stack-yaml=stack-${{ matrix.ghc-ver }}.yaml --no-terminal --system-ghc"
2828

hackage-cli.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ build-type: Simple
1919
tested-with:
2020
-- Keep in descending order.
2121
GHC == 9.8.0
22-
GHC == 9.6.2
22+
GHC == 9.6.3
2323
GHC == 9.4.7
2424
GHC == 9.2.8
2525
GHC == 9.0.2
@@ -35,8 +35,8 @@ extra-source-files:
3535
fixtures/*.diff
3636
fixtures/*.cabal
3737
-- Supported GHC versions when building with stack:
38-
stack-9.6.2.yaml
39-
stack-9.4.5.yaml
38+
stack-9.6.3.yaml
39+
stack-9.4.7.yaml
4040
stack-9.2.8.yaml
4141
stack-9.0.2.yaml
4242
stack-8.10.7.yaml
@@ -55,7 +55,7 @@ library cabal-revisions
5555
, base >= 4.10.0.0 && < 4.20
5656
, bytestring >= 0.10.4.0 && < 0.13
5757
, Cabal >= 3.4 && < 3.11
58-
, containers >= 0.5.0.0 && < 0.7
58+
, containers >= 0.5.0.0 && < 0.8
5959
, mtl >= 2.2.2 && < 2.3 || >= 2.3.1 && < 2.4
6060
, pretty ^>= 1.1.2
6161

stack-9.4.7.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: lts-21.13
2+
compiler: ghc-9.4.7
3+
compiler-check: match-exact

stack-9.6.2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
resolver: nightly-2023-07-03
1+
resolver: nightly-2023-09-27
22
compiler: ghc-9.6.2
33
compiler-check: match-exact

stack-9.6.3.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
resolver: nightly-2023-10-04
2+
compiler: ghc-9.6.3
3+
compiler-check: match-exact

0 commit comments

Comments
 (0)