From fbed132eb1ad46ac5957656083b3af425351de15 Mon Sep 17 00:00:00 2001
From: Ashley Yakeley <ashley@semantic.org>
Date: Fri, 4 Aug 2023 21:54:32 -0700
Subject: [PATCH] more workflow etc.

---
 .github/workflows/haskell.yml | 12 +++++++++---
 .gitignore                    |  1 +
 cabal.project.local           |  2 ++
 stack.yaml                    |  2 +-
 stack.yaml.lock               | 16 ++++++++--------
 5 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 cabal.project.local

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index c07a8b7..3401494 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -11,6 +11,12 @@ permissions:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        ghc:
+        - "9.2.8"
+        - "9.4.5"
+        - "9.6.2"
 
     runs-on: ubuntu-latest
 
@@ -18,8 +24,8 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-haskell@v1
       with:
-        ghc-version: '9.4.5'
-        cabal-version: '3.2'
+        ghc-version: ${{matrix.ghc}}
+        cabal-version: '3.10'
 
     - name: Cache
       uses: actions/cache@v3
@@ -40,4 +46,4 @@ jobs:
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
-      run: cabal test all
+      run: cabal test --test-show-details=always all
diff --git a/.gitignore b/.gitignore
index 0a5dbae..46b7ab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .stack-work
 .build
+dist-newstyle/
diff --git a/cabal.project.local b/cabal.project.local
new file mode 100644
index 0000000..0432756
--- /dev/null
+++ b/cabal.project.local
@@ -0,0 +1,2 @@
+ignore-project: False
+tests: True
diff --git a/stack.yaml b/stack.yaml
index 9d3a1a2..8de98dc 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-19.22
+resolver: lts-21.6
 packages: [.]
 ghc-options:
     "$locals": -Werror
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 597e037..58b92c4 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -7,34 +7,34 @@ packages:
 - completed:
     hackage: invariant-0.6@sha256:67ecd31a36c3a9a686a8bee9dbee5a395a4c68b758262413c0355bae03a5a114,3563
     pantry-tree:
-      size: 650
       sha256: 891bd4f57f67034760437dd19387122b236f1141151ed8f62682b3088ad85e20
+      size: 650
   original:
     hackage: invariant-0.6
 - completed:
     hackage: countable-1.2@sha256:4c1d43a9886ddd9ef02b3df7042122d8cf3390256d51b061b24365b682652ad2,2638
     pantry-tree:
-      size: 1050
       sha256: 38f62a16602902874ec79a107966c3147de25a94e39cb846ce18ac14d2adbdc4
+      size: 1050
   original:
     hackage: countable-1.2
 - completed:
     hackage: witness-0.6.1@sha256:b522cb9e4d6eea7cb6361c50ec330ecc82d69596f57dbdff1dcee2127b557adc,3690
     pantry-tree:
-      size: 2985
       sha256: 71817dc97637b387de201feaece2285b629e7ca2a66ef5889115efc1c0eb82f6
+      size: 2985
   original:
     hackage: witness-0.6.1
 - completed:
     hackage: type-rig-0.1@sha256:7ca3cb544b28926b2070cd45969beb5c65d540e15f487df824cbc738c2f5fb1a,2158
     pantry-tree:
-      size: 472
       sha256: 361a154dcc5f62c3fe54d072a7094b97c3ff4f753f9370ef17b17859c76e4662
+      size: 472
   original:
     hackage: type-rig-0.1
 snapshots:
 - completed:
-    size: 619399
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/22.yaml
-    sha256: 5098594e71bdefe0c13e9e6236f12e3414ef91a2b89b029fd30e8fc8087f3a07
-  original: lts-19.22
+    sha256: 2e7d4a730d8eb5373b2d383fac84efcf7c81e3b7a5fce71b4c2e19a1768f25a6
+    size: 640239
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/6.yaml
+  original: lts-21.6