Allow containers-0.7, bump CI to GHC 9.6.3

hackage-trustees · Oct 6, 2023 · 52e72a4 · 52e72a4
1 parent 8248425
commit 52e72a4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20230911
+# version: 0.17.20231002
 #
-# REGENDATA ("0.17.20230911",["github","hackage-cli.cabal"])
+# REGENDATA ("0.17.20231002",["github","hackage-cli.cabal"])
 #
 name: Haskell-CI
 on:
@@ -32,14 +32,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.0.20230822
+          - compiler: ghc-9.8.0.20230929
             compilerKind: ghc
-            compilerVersion: 9.8.0.20230822
+            compilerVersion: 9.8.0.20230929
             setup-method: ghcup
             allow-failure: true
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.6.3
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.6.3
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.7

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -14,15 +14,15 @@ jobs:
       fail-fast: false
       matrix:
         os:      [ubuntu-latest]
-        ghc-ver: [9.6.2, 9.4.6, 9.2.8, 9.0.2, 8.10.7]
+        ghc-ver: [9.6.3, 9.4.7, 9.2.8, 9.0.2, 8.10.7]
           # 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.
           # They used to work under ubuntu-20.04, but it is not worth the trouble maintaining them.
           # Apparently, HsOpenSSL-0.11.6 and older are too old for ubuntu-22.04.
         include:
           - os: macos-latest
-            ghc-ver: 9.6.2
+            ghc-ver: 9.6.3
           - os: windows-latest
-            ghc-ver: 9.6.2
+            ghc-ver: 9.6.3
     env:
       ARGS: "--stack-yaml=stack-${{ matrix.ghc-ver }}.yaml --no-terminal --system-ghc"
 

diff --git a/hackage-cli.cabal b/hackage-cli.cabal
@@ -19,7 +19,7 @@ build-type:          Simple
 tested-with:
   -- Keep in descending order.
   GHC == 9.8.0
-  GHC == 9.6.2
+  GHC == 9.6.3
   GHC == 9.4.7
   GHC == 9.2.8
   GHC == 9.0.2
@@ -35,8 +35,8 @@ extra-source-files:
   fixtures/*.diff
   fixtures/*.cabal
   -- Supported GHC versions when building with stack:
-  stack-9.6.2.yaml
-  stack-9.4.5.yaml
+  stack-9.6.3.yaml
+  stack-9.4.7.yaml
   stack-9.2.8.yaml
   stack-9.0.2.yaml
   stack-8.10.7.yaml
@@ -55,7 +55,7 @@ library cabal-revisions
     , base         >= 4.10.0.0 && < 4.20
     , bytestring   >= 0.10.4.0 && < 0.13
     , Cabal        >= 3.4      && < 3.11
-    , containers   >= 0.5.0.0  && < 0.7
+    , containers   >= 0.5.0.0  && < 0.8
     , mtl          >= 2.2.2    && < 2.3   || >= 2.3.1 && < 2.4
     , pretty      ^>= 1.1.2
 

diff --git a/stack-9.4.7.yaml b/stack-9.4.7.yaml
@@ -0,0 +1,3 @@
+resolver: lts-21.13
+compiler: ghc-9.4.7
+compiler-check: match-exact
diff --git a/stack-9.6.2.yaml b/stack-9.6.2.yaml
@@ -1,3 +1,3 @@
-resolver: nightly-2023-07-03
+resolver: nightly-2023-09-27
 compiler: ghc-9.6.2
 compiler-check: match-exact
diff --git a/stack-9.6.3.yaml b/stack-9.6.3.yaml
@@ -0,0 +1,3 @@
+resolver: nightly-2023-10-04
+compiler: ghc-9.6.3
+compiler-check: match-exact