Support GHC 9.8 (#14)

DigitalBrains1 · Oct 12, 2023 · a7c365a · a7c365a
1 parent 0c95553
commit a7c365a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/.ci/cabal.project.local-upper b/.ci/cabal.project.local-upper
@@ -1,8 +1,44 @@
 package prettyprinter-interp
   ghc-options: -Werror
+
+repository head.hackage.ghc.haskell.org
+   url: https://ghc.gitlab.haskell.org/head.hackage/
+   secure: True
+   key-threshold: 3
+   root-keys:
+       7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
+       26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
+       f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
+
+active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org
+
+-- HEAD.hackage standard allow-newer packages
 allow-newer:
+  Cabal,
+  base,
+  binary,
+  bytestring,
+  deepseq,
+  ghc,
+  ghc-bignum,
+  ghc-prim,
+  integer-gmp,
+  template-haskell,
   text,
+  time
+
+-- Boot packages
+constraints:
+  base installed,
+  ghc installed,
+  ghc-bignum installed,
+  ghc-prim installed,
+  integer-gmp installed,
+  template-haskell installed
+
+allow-newer:
   tasty,
+
 constraints:
   any.text == 2.1,
   any.tasty == 1.5,
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -84,7 +84,7 @@ jobs:
         include:
           - ghc: 8.6.5
             project-variant: -lower
-          - ghc: 9.6.3
+          - ghc: 9.8.1
             project-variant: -upper
 
       fail-fast: false
@@ -99,6 +99,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
+          cabal-update: false
 
       - name: General Setup
         run: |
@@ -112,7 +113,9 @@ jobs:
       - name: Setup CI
         # This generates dist-newstyle/cache/plan.json with hashes for all
         # dependencies, for cache invalidation.
-        run: cabal v2-build all --enable-tests --dry-run
+        run: |
+          cabal v2-update
+          cabal v2-build all --enable-tests --dry-run
 
       - name: Restore cached dependencies
         uses: actions/cache/restore@v3

diff --git a/prettyprinter-interp.cabal b/prettyprinter-interp.cabal
@@ -23,12 +23,12 @@ source-repository head
 source-repository this
   type:     git
   location: https://github.com/DigitalBrains1/prettyprinter-interp
-  tag:      v0.2.0.0+r2
+  tag:      v0.2.0.0+r3
 
 library
   exposed-modules:    Prettyprinter.Interpolate
 
-  build-depends:      base                      >=4.12      && < 4.19,
+  build-depends:      base                      >=4.12      && < 4.20,
                       prettyprinter             >=1.2       && < 1.8,
                       string-interpolate        ^>=0.3.1.0,
                       template-haskell,