Merge pull request #49 from TripShot/ghc-9.8

Prepare for GHC 9.8
snapframework · Sep 5, 2023 · c4a1b0b · c4a1b0b
2 parents e1fc241 + 2fdaf75
commit c4a1b0b
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 39 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,58 +28,60 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ghc:
-          - "8.6.5"
-          - "8.8.4"
-          - "8.10.7"
-          - "9.0.2"
-          - "9.2.7"
-          - "9.4.4"
-          - "9.6.1"
+          - "8.8"
+          - "8.10"
+          - "9.0"
+          - "9.2"
+          - "9.4"
+          - "9.6"
         include:
-          - { os: macOS-latest,   ghc: "9.6.1" }
-          - { os: windows-latest, ghc: "9.6.1" }
+          - { os: macOS-latest,   ghc: "9.6" }
+          - { os: windows-latest, ghc: "9.6" }
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup Haskell
+      - name: Set up GHC ${{ matrix.ghc-version }}
         uses: haskell/actions/setup@v2
-        id: setup-haskell-cabal
+        id: setup
         with:
           ghc-version: ${{ matrix.ghc }}
 
       - name: Configure
         run: |
-          cabal configure --enable-tests --enable-benchmarks --enable-documentation --test-show-details=direct --write-ghc-environment-files=always
-
-      - name: Freeze
-        run: |
-          cabal freeze
-
-      - uses: actions/cache@v3
-        name: Cache
+          cabal configure --enable-tests --enable-benchmarks --enable-documentation
+          cabal build --dry-run
+
+      - name: Restore cached dependencies
+        uses: actions/cache/restore@v3
+        id: cache
+        env:
+          key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }}
         with:
-          path: |
-            ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-          key:          ${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-cabal-
+          path: ${{ steps.setup.outputs.cabal-store }}
+          key: ${{ env.key }}-plan-${{ hashFiles('dist-newstyle/cache/plan.json') }}
+          restore-keys: ${{ env.key }}-
 
       - name: Install dependencies
-        run: |
-          cabal build all --only-dependencies
+        run: cabal build all --only-dependencies
+
+      - name: Save cached dependencies
+        uses: actions/cache/save@v3
+        if: ${{ steps.cache.outputs.cache-primary-key != steps.cache.outputs.cache-matched-key }}
+        with:
+          path: ${{ steps.setup.outputs.cabal-store }}
+          key: ${{ steps.cache.outputs.cache-primary-key }}
 
       - name: Build
-        run: |
-          cabal build all
+        run: cabal build all
 
       - name: Test
-        run: |
-          cabal test all
+        if: matrix.os == 'ubuntu-latest'
+        run: cabal test all
 
       - name: Documentation
         if: matrix.ghc >= '9.4'
-        run: |
-          cabal haddock
+        run: cabal haddock
 
   stack:
     name: stack / ghc ${{ matrix.ghc }}
@@ -90,13 +92,14 @@ jobs:
         include:
           # GHC version must match https://www.stackage.org/nightly
           - stack: "latest"
-            ghc: "9.4"
+            ghc: "9.6"
 
     steps:
       - uses: actions/checkout@v3
 
       - uses: haskell/actions/setup@v2
         name: Setup Haskell Stack
+        id: setup
         with:
           ghc-version: ${{ matrix.ghc }}
           stack-version: ${{ matrix.stack }}
@@ -116,7 +119,7 @@ jobs:
         with:
           path: |
             ~/.stack
-          key: ${{ runner.os }}-${{ matrix.ghc }}-stack
+          key: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-stack
 
       - name: Install dependencies
         run: |

diff --git a/xmlhtml.cabal b/xmlhtml.cabal
@@ -1,6 +1,6 @@
 cabal-version:       2.2
 Name:                xmlhtml
-Version:             0.2.5.4
+Version:             0.2.5.5.0
 Synopsis:            XML parser and renderer with HTML 5 quirks mode
 Description:         Contains renderers and parsers for both XML and HTML 5
                      document fragments, which share data structures so that
@@ -34,9 +34,12 @@ Tested-With:
   GHC == 8.8.4
   GHC == 8.10.7
   GHC == 9.0.2
-  GHC == 9.2.7
-  GHC == 9.4.4
-  GHC == 9.6.1
+  GHC == 9.2.8
+  GHC == 9.4.7
+  GHC == 9.6.2
+
+extra-doc-files:
+  CHANGELOG.md
 
 Extra-source-files:
              .ghci,
@@ -45,7 +48,6 @@ Extra-source-files:
              extra/logo.gif,
              haddock.sh,
              README.md,
-             CHANGELOG.md,
              test/src/TestSuite.hs
              test/src/Text/XmlHtml/CursorTests.hs,
              test/src/Text/XmlHtml/DocumentTests.hs,
@@ -843,7 +845,7 @@ Library
                        bytestring-builder   >= 0.10.4.0.2 && < 0.11,
                        containers           >= 0.3   && < 0.7,
                        parsec               >= 3.1.2 && < 3.2,
-                       text                 >= 0.11  && < 2.1,
+                       text                 >= 0.11  && < 2.2,
                        unordered-containers >= 0.1.4 && < 0.3
 
   default-extensions: