Support ghc-9.8 (#20)

co-log · Oct 20, 2023 · 6dbdc6f · 6dbdc6f
1 parent ee4e49b
commit 6dbdc6f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  workflow_dispatch:
   pull_request:
     types: [synchronize, opened, reopened]
   push:
@@ -14,19 +15,25 @@ jobs:
     name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        cabal: ["3.10.1.0"]
+        cabal: ['latest']
         ghc:
-          - "8.4.4"
-          - "8.6.5"
-          - "8.8.4"
-          - "8.10.7"
-          - "9.0.2"
-          - "9.2.8"
-          - "9.4.7"
-          - "9.6.2"
+          - '8.4.4'
+          - '8.6.5'
+          - '8.8.4'
+          - '8.10.7'
+          - '9.0.2'
+          - '9.2.8'
+          - '9.4.7'
+          - '9.6.3'
+          - '9.8.1'
         exclude:
+          - os: macOS-latest
+            ghc: 9.6.3
+          - os: macOS-latest
+            ghc: 9.4.7
           - os: macOS-latest
             ghc: 9.2.8
           - os: macOS-latest
@@ -39,9 +46,11 @@ jobs:
             ghc: 8.6.5
           - os: macOS-latest
             ghc: 8.4.4
-          - os: macOS-latest
-            ghc: 8.2.2
 
+          - os: windows-latest
+            ghc: 9.6.3
+          - os: windows-latest
+            ghc: 9.4.7
           - os: windows-latest
             ghc: 9.2.8
           - os: windows-latest
@@ -54,45 +63,43 @@ jobs:
             ghc: 8.6.5
           - os: windows-latest
             ghc: 8.4.4
-          - os: windows-latest
-            ghc: 8.2.2
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - uses: haskell/actions/setup@v2
-      id: setup-haskell-cabal
-      name: Setup Haskell
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+      - uses: haskell/actions/setup@v2
+        id: setup-haskell-cabal
+        name: Setup Haskell
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
-    - name: Configure
-      run: |
-        cabal configure --enable-tests --enable-benchmarks --enable-documentation --test-show-details=direct --write-ghc-environment-files=always
+      - 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
+      - name: Freeze
+        run: |
+          cabal freeze
 
-    - uses: actions/cache@v3
-      name: Cache ~/.cabal/store
-      with:
-        path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+      - uses: actions/cache@v3
+        name: Cache ~/.cabal/store
+        with:
+          path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
+          key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
 
-    - name: Install dependencies
-      run: |
-        cabal build all --only-dependencies
+      - name: Install dependencies
+        run: |
+          cabal build all --only-dependencies
 
-    - name: Build
-      run: |
-        cabal build all
+      - name: Build
+        run: |
+          cabal build all
 
-    - name: Test
-      run: |
-        cabal test all
+      - name: Test
+        run: |
+          cabal test all
 
-    - name: Documentation
-      if: ${{ contains(fromJSON('["9.4.7", "9.6.2"]'), matrix.ghc) }}
-      run: |
-        cabal haddock
+      - name: Documentation
+        if: ${{ contains(fromJSON('["9.4.7", "9.6.3"]'), matrix.ghc) }}
+        run: |
+          cabal haddock
diff --git a/co-log-polysemy.cabal b/co-log-polysemy.cabal
@@ -34,14 +34,15 @@ tested-with:         GHC == 8.4.4
                      GHC == 9.0.2
                      GHC == 9.2.8
                      GHC == 9.4.7
-                     GHC == 9.6.2
+                     GHC == 9.6.3
+                     GHC == 9.8.1
 
 source-repository head
   type:                git
   location:            https://github.com/co-log/co-log-polysemy.git
 
 common common-options
-  build-depends:       base >= 4.11 && < 4.19
+  build-depends:       base >= 4.11 && < 4.20
 
   ghc-options:         -O2
                        -Wall