Test with GHC 9.8.1, drop 9.2.x

mrkkrp · Oct 26, 2023 · 2abbb45 · 2abbb45
1 parent f7eef44
commit 2abbb45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,12 +19,12 @@ jobs:
     strategy:
       matrix:
         cabal: ["3.10"]
-        ghc: ["9.2.8", "9.4.7", "9.6.2"]
+        ghc: ["9.4.7", "9.6.3", "9.8.1"]
     env:
       CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
     steps:
       - uses: actions/checkout@v4
-      - uses: haskell/actions/setup@v2
+      - uses: haskell-actions/setup@v2
         id: setup-haskell-cabal
         with:
           ghc-version: ${{ matrix.ghc }}

diff --git a/cue-sheet.cabal b/cue-sheet.cabal
@@ -5,7 +5,7 @@ license:         BSD-3-Clause
 license-file:    LICENSE.md
 maintainer:      Mark Karpov <markkarpov92@gmail.com>
 author:          Mark Karpov <markkarpov92@gmail.com>
-tested-with:     ghc ==9.2.8 ghc ==9.4.7 ghc ==9.6.2
+tested-with:     ghc ==9.4.7 ghc ==9.6.3 ghc ==9.8.1
 homepage:        https://github.com/mrkkrp/cue-sheet
 bug-reports:     https://github.com/mrkkrp/cue-sheet/issues
 synopsis:
@@ -39,14 +39,14 @@ library
 
     default-language: GHC2021
     build-depends:
-        QuickCheck >=2.4 && <3.0,
-        base >=4.15 && <5.0,
+        QuickCheck >=2.4 && <3,
+        base >=4.15 && <5,
         bytestring >=0.10.8 && <0.12,
         containers >=0.5 && <0.7,
         exceptions >=0.6 && <0.11,
-        megaparsec >=7.0 && <10.0,
-        mtl >=2.0 && <3.0,
-        text >=0.2 && <2.1
+        megaparsec >=7 && <10,
+        mtl >=2 && <3,
+        text >=0.2 && <2.2
 
     if flag(dev)
         ghc-options:
@@ -56,10 +56,13 @@ library
     else
         ghc-options: -O2 -Wall
 
+    if impl(ghc >=9.8)
+        ghc-options: -Wno-x-partial
+
 test-suite tests
     type:               exitcode-stdio-1.0
     main-is:            Spec.hs
-    build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0
+    build-tool-depends: hspec-discover:hspec-discover >=2 && <3
     hs-source-dirs:     tests
     other-modules:
         Text.CueSheet.ParserSpec
@@ -68,15 +71,15 @@ test-suite tests
 
     default-language:   GHC2021
     build-depends:
-        QuickCheck >=2.4 && <3.0,
-        base >=4.15 && <5.0,
+        QuickCheck >=2.4 && <3,
+        base >=4.15 && <5,
         bytestring >=0.10.8 && <0.12,
         cue-sheet,
         exceptions >=0.6 && <0.11,
-        hspec >=2.0 && <3.0,
-        hspec-megaparsec >=2.0 && <3.0,
-        megaparsec >=7.0 && <10.0,
-        text >=0.2 && <2.1
+        hspec >=2 && <3,
+        hspec-megaparsec >=2 && <3,
+        megaparsec >=7 && <10,
+        text >=0.2 && <2.2
 
     if flag(dev)
         ghc-options: