From c54746645045f12c723b5ea0e160f41cf8c3c5f3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 2 Oct 2024 15:10:26 -0400
Subject: [PATCH 1/2] CI GHC 9.10

---
 .github/workflows/haskell.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index ea9f18f..1b841c0 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -6,27 +6,30 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.6.5', '8.8.4']
+        ghc: ['8.6.5', '8.8.4', '8.10.7', '9.0.2', '9.2.5', '9.4.5', '9.6.1', '9.8.2', '9.10.1']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+
+    - uses: actions/checkout@v3
+
+    - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
     - name: Cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       env:
         cache-name: cache-cabal
       with:
         path: ~/.cabal
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+        key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
         restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-
+          ${{ runner.os }}-${{ matrix.ghc }}-
+          ${{ runner.os }}
 
     - name: Install dependencies
       run: |
@@ -35,7 +38,12 @@ jobs:
         touch nix-prefetch-git
         touch nix-prefetch-url
         chmod 755 nix-prefetch-git nix-prefetch-url
+
     - name: Build
       run: env PATH=.:$PATH cabal build --enable-tests --enable-benchmarks all
+
     - name: Run tests
-      run: env PATH=.:$PATH cabal test all
+      run: env PATH=.:$PATH cabal test --enable-tests all
+
+    - name: Build Docs
+      run: cabal haddock

From cb321a162111d7a3c361d8c8530991972b67a3f1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 2 Oct 2024 16:57:38 -0400
Subject: [PATCH 2/2] Need local path for docs too

---
 .github/workflows/haskell.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 1b841c0..d79dfb3 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -46,4 +46,4 @@ jobs:
       run: env PATH=.:$PATH cabal test --enable-tests all
 
     - name: Build Docs
-      run: cabal haddock
+      run: env PATH=.:$PATH cabal haddock