From 3641b6b9fbb428f2c581c0f8de50dace1d9b2fbd Mon Sep 17 00:00:00 2001
From: John Ky <john.ky@iohk.io>
Date: Sat, 8 Mar 2025 14:10:23 +1100
Subject: [PATCH] Update bounds

---
 .github/workflows/haskell.yml | 18 +++++++++++-------
 bits-extra.cabal              |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 2837190..99e0443 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -17,12 +17,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8", "9.0.2", "8.10.7"]
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        ghc: ["9.12.1", "9.10.1", "9.8.4", "9.6.6", "9.4.8", "9.2.8", "9.0.2", "8.10.7"]
+        os: [ubuntu-latest]
+        cabal: ["3.10.2.1"]
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2024-01-05"
+      CABAL_CACHE_VERSION: "2025-03-05"
 
     steps:
       - uses: actions/checkout@v2
@@ -31,7 +32,7 @@ jobs:
         id: setup-haskell
         with:
           ghc-version: ${{ matrix.ghc }}
-          cabal-version: '3.10.2.1'
+          cabal-version: ${{ matrix.cabal}}
 
       - name: Set some window specific things
         if: matrix.os == 'windows-latest'
@@ -47,22 +48,25 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          BINARY_CACHE_URI: ${{ vars.BINARY_CACHE_URI }}
         with:
           region: us-west-2
           dist-dir: dist-newstyle
           store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
           threads: 16
-          archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
-          skip: "${{ secrets.BINARY_CACHE_URI == '' }}"
+          archive-uri: ${{ env.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
+          skip: "${{ env.BINARY_CACHE_URI == '' }}"
 
       - name: Cabal cache over HTTPS
         uses: action-works/cabal-cache-s3@v1
+        env:
+          BINARY_CACHE_URI: ${{ vars.BINARY_CACHE_URI }}
         with:
           dist-dir: dist-newstyle
           store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
           threads: 16
           archive-uri: https://cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
-          skip: "${{ secrets.BINARY_CACHE_URI != '' }}"
+          skip: "${{ env.BINARY_CACHE_URI != '' }}"
 
       - name: Build
         run: cabal build all --enable-tests --enable-benchmarks
diff --git a/bits-extra.cabal b/bits-extra.cabal
index ba676f3..cfab57f 100644
--- a/bits-extra.cabal
+++ b/bits-extra.cabal
@@ -29,10 +29,10 @@ flag bmi2
 common base                       { build-depends: base                       >= 4.11       && < 5      }
 
 common criterion                  { build-depends: criterion                  >= 1.3        && < 1.7    }
-common doctest                    { build-depends: doctest                    >= 0.16.2     && < 0.23   }
+common doctest                    { build-depends: doctest                    >= 0.16.2     && < 0.25   }
 common doctest-discover           { build-depends: doctest-discover           >= 0.2        && < 0.3    }
-common ghc-prim                   { build-depends: ghc-prim                   >= 0.5        && < 0.12   }
-common hedgehog                   { build-depends: hedgehog                   >= 0.5.3      && < 1.5    }
+common ghc-prim                   { build-depends: ghc-prim                   >= 0.5        && < 0.14   }
+common hedgehog                   { build-depends: hedgehog                   >= 0.5.3      && < 1.6    }
 common hspec                      { build-depends: hspec                      >= 2.4        && < 3      }
 common hw-hedgehog                { build-depends: hw-hedgehog                >= 0.1        && < 0.2    }
 common hw-hspec-hedgehog          { build-depends: hw-hspec-hedgehog          >= 0.1        && < 0.2    }