From d79f6b89a126d43fddf0964ba72363d16fd14be5 Mon Sep 17 00:00:00 2001
From: Peter Lebbing <peter@digitalbrains.com>
Date: Wed, 11 Oct 2023 11:06:18 +0200
Subject: [PATCH] Simplify Stack CI

For Stack CI, GHC doesn't need to be installed globally; only the
version installed by Stack is actually used.

Also bump all Stack/GHC versions in CI
---
 .ci/stack-9.4.yaml        |  2 +-
 .ci/stack-9.6.yaml        |  2 +-
 .github/workflows/ci.yaml | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.ci/stack-9.4.yaml b/.ci/stack-9.4.yaml
index 58c8451..106d8a8 100644
--- a/.ci/stack-9.4.yaml
+++ b/.ci/stack-9.4.yaml
@@ -1,3 +1,3 @@
-resolver: lts-21.12
+resolver: lts-21.14
 ghc-options:
   "$locals": -Wall -Wcompat
diff --git a/.ci/stack-9.6.yaml b/.ci/stack-9.6.yaml
index 20739e5..3175d61 100644
--- a/.ci/stack-9.6.yaml
+++ b/.ci/stack-9.6.yaml
@@ -1,3 +1,3 @@
-resolver: nightly-2023-09-17
+resolver: nightly-2023-10-09
 ghc-options:
   "$locals": -Wall -Wcompat
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f51b39c..8dcc92c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7", "9.6.2"]
+        ghc: ["8.6", "8.8", "8.10", "9.0", "9.2", "9.4", "9.6"]
       fail-fast: false
     steps:
       - name: Checkout
@@ -28,14 +28,12 @@ jobs:
         uses: haskell/actions/setup@v2
         id: setup-haskell
         with:
-          ghc-version: ${{ matrix.ghc }}
           enable-stack: true
+          stack-no-global: true
 
       - name: General Setup
         run: |
-          declare GHC_VERSION=${{ matrix.ghc }}
-          # Rewrite an argument of the form X.Y.Z to X.Y
-          cp .ci/stack-${GHC_VERSION%.*}.yaml stack.yaml
+          cp .ci/stack-{{ matrix.ghc }}.yaml stack.yaml
           # Print out some information for debugging purposes
           ghc --version
           stack --version
@@ -81,12 +79,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7", "9.6.2"]
+        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7", "9.6.3"]
         project-variant: [""]
         include:
           - ghc: 8.6.5
             project-variant: -lower
-          - ghc: 9.6.2
+          - ghc: 9.6.3
             project-variant: -upper
 
       fail-fast: false