From ca17859b5f691a2ea4d9c9137fc42b3e411b4183 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Wed, 8 Nov 2023 10:25:08 +0100
Subject: [PATCH] Update CI

Add GHC 9.4.7

Bump minor versions of GHC 9.0 and 8.10

Use Cabal 3.10
---
 .github/workflows/ci.yaml | 15 ++++++++-------
 ci.dhall                  |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2b6a7d0..ae6467e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -2,9 +2,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: "actions/checkout@v1"
+      - uses: "actions/checkout@v3"
       - id: setup-haskell-cabal
-        uses: "haskell/actions/setup@v1.2"
+        uses: "haskell-actions/setup@v2"
         with:
           cabal-version: "${{ matrix.cabal }}"
           enable-stack: false
@@ -17,8 +17,8 @@ jobs:
             cp cabal.project.local.ci cabal.project.local
           fi
       - name: freeze
-        run: cabal freeze
-      - uses: "actions/cache@v2"
+        run: cabal freeze --enable-tests --enable-benchmarks
+      - uses: "actions/cache@v3"
         with:
           key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
           path: |
@@ -35,10 +35,11 @@ jobs:
     strategy:
       matrix:
         cabal:
-          - '3.4'
+          - '3.10'
         ghc:
-          - '8.10.5'
-          - '9.0.1'
+          - '9.4.7'
+          - '9.0.2'
+          - '8.10.7'
 name: Haskell CI
 on:
   - push
diff --git a/ci.dhall b/ci.dhall
index 04b06ac..8402cc3 100644
--- a/ci.dhall
+++ b/ci.dhall
@@ -5,10 +5,11 @@ in    haskellCi.generalCi
         haskellCi.matrixSteps
         ( Some
             { ghc =
-              [ haskellCi.GHC.GHC8105
-              , haskellCi.GHC.GHC901
+              [ haskellCi.GHC.GHC947
+              , haskellCi.GHC.GHC902
+              , haskellCi.GHC.GHC8107
               ]
-            , cabal = [ haskellCi.Cabal.Cabal34 ]
+            , cabal = [ haskellCi.Cabal.Cabal310 ]
             }
         )
     : haskellCi.CI.Type