Add support for GHC 9.12, drop support for GHC 9.6 (#143)

tfausak · Feb 1, 2025 · 8442912 · 8442912
1 parent f81e0d7
commit 8442912
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,23 +5,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: mkdir artifact
-      - id: haskell
-        uses: haskell-actions/setup@v2
+      - uses: haskell/ghcup-setup@v1
         with:
-          ghc-version: ${{ matrix.ghc }}
+          ghc: ${{ matrix.ghc }}
+          cabal: latest
       - run: ghc-pkg list
       - run: cabal sdist --output-dir artifact
       - run: cabal configure --flags=pedantic --jobs
       - run: cat cabal.project.local
       - run: cp cabal.project.local artifact
+      - run: cabal update
       - run: cabal freeze
       - run: cat cabal.project.freeze
       - run: cp cabal.project.freeze artifact
       - run: cabal outdated --v2-freeze-file
       - uses: actions/cache@v4
         with:
           key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
-          path: ${{ steps.haskell.outputs.cabal-store }}
+          path: ~/.local/state/cabal
           restore-keys: ${{ matrix.os }}-${{ matrix.ghc }}-
       - run: cabal build --only-download
       - run: cabal build --only-dependencies
@@ -34,17 +35,17 @@ jobs:
     strategy:
       matrix:
         include:
-          - ghc: '9.10'
+          - ghc: 9.12
             os: macos-13
-          - ghc: '9.10'
+          - ghc: 9.12
             os: macos-14
-          - ghc: 9.6
-            os: ubuntu-22.04
           - ghc: 9.8
-            os: ubuntu-22.04
-          - ghc: '9.10'
-            os: ubuntu-22.04
+            os: ubuntu-24.04
           - ghc: '9.10'
+            os: ubuntu-24.04
+          - ghc: 9.12
+            os: ubuntu-24.04
+          - ghc: 9.12
             os: windows-2022
   cabal:
     name: Cabal
@@ -84,7 +85,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: strive-${{ github.sha }}-ubuntu-22.04-9.10
+          name: strive-${{ github.sha }}-ubuntu-24.04-9.12
       - run: tar --extract --file artifact.tar --verbose
       - uses: softprops/action-gh-release@v2
         with:

diff --git a/strive.cabal b/strive.cabal
@@ -22,7 +22,7 @@ flag pedantic
   manual: True
 
 common library
-  build-depends: base ^>=4.18.0.0 || ^>=4.19.0.0 || ^>=4.20.0.0
+  build-depends: base ^>=4.19.0.0 || ^>=4.20.0.0 || ^>=4.21.0.0
   build-depends:
     aeson ^>=2.1.2.1 || ^>=2.2.2.0,
     bytestring ^>=0.11.4.0 || ^>=0.12.0.2,
@@ -31,7 +31,7 @@ common library
     http-client ^>=0.7.17,
     http-client-tls ^>=0.3.6.3,
     http-types ^>=0.12.4,
-    template-haskell ^>=2.20.0.0 || ^>=2.21.0.0 || ^>=2.22.0.0,
+    template-haskell ^>=2.21.0.0 || ^>=2.22.0.0 || ^>=2.23.0.0,
     text ^>=2.0.2 || ^>=2.1,
     time ^>=1.12.2 || ^>=1.14,
     transformers ^>=0.6.1.0,