Merge pull request #46 from HeinrichApfelmus/HeinrichApfelmus/bump

Bump dependencies to support GHC 9.12
HeinrichApfelmus · Dec 22, 2024 · 1d28a99 · 1d28a99
2 parents 6301c27 + 6c8242e
commit 1d28a99
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 81 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -18,87 +18,87 @@ jobs:
     name: ${{ matrix.os }}-ghc-${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.allow-failure }}
-    env:
-      cabal-build-dir: b
     strategy:
       matrix:
         allow-failure:
           - false
         os:
           - ubuntu-latest
         cabal:
-          - latest
+          - '3.12'
         ghc:
-          - 8.0.2
-          - 8.2.2
-          - 8.4.4
-          - 8.6.5
-          - 8.8.4
-          - 8.10.7
-          - 9.2.8
-          - 9.4.7
-          - 9.6.6
-          - 9.8.2
-          - 9.10.1
+          - '8.0'
+          - '8.2'
+          - '8.4'
+          - '8.6'
+          - '8.10'
+          - '9.2'
+          - '9.4'
+          - '9.6'
+          - '9.8'
+          - '9.10'
+          - '9.12'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Environment
         uses: haskell-actions/setup@v2
-        id: setup-haskell-cabal
+        id: setup
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: ${{ matrix.cabal }}
 
       - name: Configure
-        run: >
-          cabal configure
-          --builddir=${{ env.cabal-build-dir }}
-          --enable-tests
-          --enable-benchmarks
-          --enable-documentation
-          --test-show-details=direct
-          --write-ghc-environment-files=always
-
-      - name: Freeze
-        run: >
-          cabal freeze
-          --builddir=${{ env.cabal-build-dir }}
+        run: |
+          cabal configure \
+            --enable-tests \
+            --enable-benchmarks \
+            --enable-documentation \
+            --test-show-details=direct \
+            --write-ghc-environment-files=always
+          cabal build all --dry-run
+        # The last step generates dist-newstyle/cache/plan.json for the cache key.
 
-      - name: Cache
-        uses: actions/cache@v3
+      # For a description of how the Caching works, see
+      # https://github.com/haskell-actions/setup?tab=readme-ov-file#model-cabal-workflow-with-caching
+      - name: Dependencies (Restore from cache)
+        uses: actions/cache/restore@v4
+        id: cache
         env:
-          hash: ${{ hashFiles('cabal.project.freeze') }}
+          key: ${{ matrix.os }}-ghc-${{ matrix.ghc }}
+          hash: ${{ hashFiles('**/plan.json') }}
         with:
-          key: ${{ matrix.os }}-ghc-${{ matrix.ghc }}-${{ env.hash }}
-          restore-keys: |
-            ${{ matrix.os }}-ghc-${{ matrix.ghc }}-
-          path: |
-            ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-            ${{ env.cabal-build-dir }}
+          key: ${{ env.key }}-${{ env.hash }}
+          restore-keys: ${{ env.key }}-
+          path: ${{ steps.setup.outputs.cabal-store }}
 
-      - name: Dependencies
-        run: >
-          cabal build all
-          --builddir=${{ env.cabal-build-dir }}
-          --only-dependencies
+      - name: Dependencies (Install)
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: cabal build all --only-dependencies
+
+      # Cache dependencies already here,
+      # so that we do not have to rebuild them should the subsequent steps fail.
+      - name: Dependencies (Save cache)
+        uses: actions/cache/save@v4
+        # If we had an exact cache hit,
+        # trying to save the cache would error because of key clash.
+        if: steps.cache.outputs.cache-hit != 'true'
+        with:
+          key: ${{ steps.cache.outputs.cache-primary-key }}
+          path: ${{ steps.setup.outputs.cabal-store }}
 
       - name: Build
         run: >
           cabal build all
-          --builddir=${{ env.cabal-build-dir }}
           --enable-tests
           --enable-benchmarks
-          --ghc-options=-Wall
 
       - name: Test
         run: >
           cabal test all
-          --builddir=${{ env.cabal-build-dir }}
 
       - name: Benchmark
         run: >
           cabal bench all
-          --builddir=${{ env.cabal-build-dir }}
           || true
diff --git a/vault.cabal b/vault.cabal
@@ -1,8 +1,8 @@
 cabal-version:      3.4
-Name:               vault
-Version:            0.3.1.5
-Synopsis:           a persistent store for values of arbitrary types
-Description:
+name:               vault
+version:            0.3.1.5
+synopsis:           a persistent store for values of arbitrary types
+description:
   A /vault/ is a persistent store for values of arbitrary types.
   It's like having first-class access to the storage space behind IORefs.
   .
@@ -12,27 +12,29 @@ Description:
   .
   Also provided is a /locker/ type, representing a store for a single element.
 
-Category:           Data
-License:            BSD-3-Clause
-License-file:       LICENSE
-Author:             Heinrich Apfelmus, Elliott Hird
-Maintainer:         Heinrich Apfelmus <apfelmus at quantentunnel de>
-Homepage:           https://github.com/HeinrichApfelmus/vault
-Copyright:          (c) Heinrich Apfelmus 2011-2013
+category:           Data
 
-build-type:         Simple
-Tested-With:         GHC == 8.0.2
-                    ,GHC == 8.2.2
-                    ,GHC == 8.4.4
-                    ,GHC == 8.6.5
-                    ,GHC == 8.8.4
-                    ,GHC == 8.10.7
-                    ,GHC == 9.0.2
-                    ,GHC == 9.2.8
-                    ,GHC == 9.4.8
-                    ,GHC == 9.6.6
-                    ,GHC == 9.8.2
-                    ,GHC == 9.10.1
+license:            BSD-3-Clause
+license-file:       LICENSE
+author:             Heinrich Apfelmus, Elliott Hird
+maintainer:         Heinrich Apfelmus <apfelmus at quantentunnel de>
+homepage:           https://github.com/HeinrichApfelmus/vault
+copyright:          (c) Heinrich Apfelmus 2011-2013
+
+Tested-With:
+    , GHC == 8.0.2
+    , GHC == 8.2.2
+    , GHC == 8.4.4
+    , GHC == 8.6.5
+    , GHC == 8.8.4
+    , GHC == 8.10.7
+    , GHC == 9.0.2
+    , GHC == 9.2.8
+    , GHC == 9.4.8
+    , GHC == 9.6.6
+    , GHC == 9.8.4
+    , GHC == 9.10.1
+    , GHC == 9.12.1
 
 extra-source-files:
     CHANGELOG.md
@@ -49,12 +51,13 @@ flag UseGHC
     description: Use GHC-specific packages and extensions.
     default:     True
 
-Library
+library
     hs-source-dirs:     src
-    build-depends:      base >= 4.5 && < 4.21,
-                        containers >= 0.4 && < 0.8,
-                        unordered-containers >= 0.2.3.0 && < 0.3,
-                        hashable >= 1.1.2.5 && < 1.6
+    build-depends:
+        , base >= 4.5 && < 4.22
+        , containers >= 0.4 && < 0.8
+        , unordered-containers >= 0.2.3.0 && < 0.3
+        , hashable >= 1.1.2.5 && < 1.6
 
     if impl(ghc < 8.0)
         build-depends:  semigroups >= 0.1 && < 1.0
@@ -64,11 +67,11 @@ Library
     ghc-options:        -Wall -fno-warn-missing-signatures
 
     exposed-modules:
-                        Data.Vault.Lazy,
-                        Data.Vault.Strict,
-                        Data.Vault.ST.Lazy,
-                        Data.Vault.ST.Strict,
-                        Data.Unique.Really
+        Data.Vault.Lazy
+        Data.Vault.Strict
+        Data.Vault.ST.Lazy
+        Data.Vault.ST.Strict
+        Data.Unique.Really
 
     if impl(ghc) && flag(UseGHC)
         CPP-options:    -DUseGHC