Make it build with ghc-9.8, continued

input-output-hk · Nov 30, 2023 · e388df2 · e388df2
1 parent 15d73bc
commit e388df2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -1,5 +1,10 @@
 name: Haskell CI
 
+# Limit concurrent runs of this workflow within a single PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches: [ "main" ]
@@ -16,8 +21,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.7", "9.4.5", "9.6.1"]
-        cabal: ["3.10.1.0"]
+        ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.3", "9.8.1"]
+        cabal: ["3.10.2.0"]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
@@ -72,8 +77,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.2.7"]
-        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8"]
+        cabal: ["3.10.2.0"]
         os: [ubuntu-latest]
 
     steps:
@@ -131,8 +136,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.2.7"]
-        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8"]
+        cabal: ["3.10.2.0"]
         os: [ubuntu-latest]
 
     steps:
@@ -190,8 +195,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.2.7"]
-        cabal: ["3.10.1.0"]
+        ghc: ["9.2.8"]
+        cabal: ["3.10.2.0"]
         os: [ubuntu-latest]
 
     steps:

diff --git a/cabal.project b/cabal.project
@@ -10,6 +10,12 @@ repository cardano-haskell-packages
     c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
+index-state:
+  -- Bump this if you need newer packages from Hackage
+  , hackage.haskell.org 2023-11-30T00:00:00Z
+  -- Bump this if you need newer packages from CHaP
+  , cardano-haskell-packages 2023-11-30T00:00:00Z
+
 packages:
   fs-api
   fs-sim
@@ -22,4 +28,3 @@ if impl(ghc >=9.8)
   allow-newer:
     -- https://github.com/wrengr/unix-bytestring/pull/46
     , unix-bytestring:base
-
diff --git a/fs-sim/fs-sim.cabal b/fs-sim/fs-sim.cabal
@@ -69,7 +69,7 @@ test-suite fs-sim-test
     , generics-sop
     , pretty-show
     , QuickCheck
-    , quickcheck-state-machine  >=0.7.2
+    , quickcheck-state-machine  >=0.7.2 && <0.8
     , random
     , tasty
     , tasty-hunit