From fde62da03dbf3da7bf5831ef0f79234f98affd7c Mon Sep 17 00:00:00 2001
From: Martijn Bastiaan <martijn@qbaylogic.com>
Date: Fri, 16 Feb 2024 16:47:35 +0100
Subject: [PATCH] Relax bounds + update CI

---
 .github/workflows/ci.yml                    | 23 ++++++++++++++-------
 clash-vexriscv-sim/clash-vexriscv-sim.cabal |  6 +++---
 clash-vexriscv/clash-vexriscv.cabal         | 10 ++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2280b17..4d06ea1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: 2022 Google LLC
-# 
+#
 # SPDX-License-Identifier: Apache-2.0
 
 name: CI
@@ -54,7 +54,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --target riscv32imc-unknown-none-elf --all-features
-  
+
   rust-build-programs:
     name: Build Programs
     runs-on: ubuntu-22.04
@@ -81,16 +81,16 @@ jobs:
         with:
           command: build
           args: --release
-      
+
       - name: Build debug binaries
         uses: actions-rs/cargo@v1
         with:
           command: build
-      
+
       - name: Archive Integration Test Binaries
         run: |
           cd clash-vexriscv-sim; sh bundle_test_binaries.sh
-      
+
       - name: Upload Integration Test Binaries
         uses: actions/upload-artifact@v3
         with:
@@ -103,8 +103,17 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [rust-build-programs]
 
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc:
+          - "9.0.2"
+          - "9.2.8"
+          - "9.4.8"
+          - "9.6.4"
+
     container:
-      image: ghcr.io/clash-lang/clash-ci-9.0.2:2022-12-13
+      image: ghcr.io/clash-lang/clash-ci-${{ matrix.ghc }}:2024-02-15
 
     steps:
       - name: Checkout
@@ -120,7 +129,7 @@ jobs:
         with:
           path: |
             ~/.cabal/store
-          key: packages-cachebust-1-${{ hashFiles('cabal.project.freeze', 'cabal.project') }}
+          key: packages-cachebust-1-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze', 'cabal.project') }}
           restore-keys: packages-cachebust-1-
 
       - name: Install build deps
diff --git a/clash-vexriscv-sim/clash-vexriscv-sim.cabal b/clash-vexriscv-sim/clash-vexriscv-sim.cabal
index 6e72e8d..5af01f5 100644
--- a/clash-vexriscv-sim/clash-vexriscv-sim.cabal
+++ b/clash-vexriscv-sim/clash-vexriscv-sim.cabal
@@ -60,9 +60,9 @@ common common-options
     -fno-worker-wrapper
       -- clash-prelude will set suitable version bounds for the plugins
   build-depends:
-    base >= 4.14 && < 4.16,
+    base >= 4.14 && < 4.19,
     clash-prelude >= 1.6 && < 1.10,
-    containers >= 0.6 && < 0.7,
+    containers >= 0.6 && < 0.8,
     ghc-typelits-natnormalise,
     ghc-typelits-extra,
     ghc-typelits-knownnat,
@@ -83,7 +83,7 @@ library
     clash-protocols,
     clash-vexriscv,
     elf >= 0.31 && < 0.32,
-    bytestring >= 0.10 && < 0.11,
+    bytestring >= 0.10 && < 0.13,
 
 executable clash
   import: common-options
diff --git a/clash-vexriscv/clash-vexriscv.cabal b/clash-vexriscv/clash-vexriscv.cabal
index 44d68ef..8cd986b 100644
--- a/clash-vexriscv/clash-vexriscv.cabal
+++ b/clash-vexriscv/clash-vexriscv.cabal
@@ -87,7 +87,7 @@ common common-options
     -fno-worker-wrapper
       -- clash-prelude will set suitable version bounds for the plugins
   build-depends:
-    base >= 4.14 && < 4.16,
+    base >= 4.14 && < 4.19,
     clash-prelude >= 1.6 && < 1.10,
     containers >= 0.6 && < 0.7,
     ghc-typelits-natnormalise,
@@ -109,7 +109,7 @@ library
     base,
     clash-prelude,
     clash-protocols,
-    bytestring >= 0.10 && < 0.11,
+    bytestring >= 0.10 && < 0.13,
     process >= 1.6 && < 1.8,
     directory >= 1.3 && < 1.4,
     filepath,
@@ -134,9 +134,9 @@ test-suite unittests
     base,
     clash-vexriscv,
     bytestring,
-    hedgehog >= 1.0 && < 1.1,
-    tasty >= 1.4 && < 1.5,
-    tasty-hedgehog >= 1.2 && < 1.3,
+    hedgehog >= 1.0 && < 1.5,
+    tasty >= 1.4 && < 1.7,
+    tasty-hedgehog >= 1.2 && < 1.7,
     tasty-hunit,
     tasty-th,
     template-haskell,