From 809f8c9ac367b79348eb9531adda939752355df8 Mon Sep 17 00:00:00 2001 From: John Ky Date: Sat, 6 Jan 2024 17:08:23 +1100 Subject: [PATCH] Update upper bounds --- .github/workflows/haskell.yml | 14 +++++++++----- hw-prim.cabal | 12 ++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ab47bd3..e65a47d 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -17,20 +17,24 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.4.2", "9.2.4", "9.0.2", "8.10.7", "8.8.4"] + 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] exclude: - os: windows-latest ghc: "9.4.2" + env: + # Modify this value to "invalidate" the cabal cache. + CABAL_CACHE_VERSION: "2024-01-05" + steps: - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 id: setup-haskell with: ghc-version: ${{ matrix.ghc }} - cabal-version: 3.8.1.0 + cabal-version: '3.10.2.1' - name: Set some window specific things if: matrix.os == 'windows-latest' @@ -51,7 +55,7 @@ jobs: dist-dir: dist-newstyle store-path: ${{ steps.setup-haskell.outputs.cabal-store }} threads: 16 - archive-uri: ${{ secrets.BINARY_CACHE_URI }} + archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }} skip: "${{ secrets.BINARY_CACHE_URI == '' }}" - name: Cabal cache over HTTPS @@ -60,7 +64,7 @@ jobs: dist-dir: dist-newstyle store-path: ${{ steps.setup-haskell.outputs.cabal-store }} threads: 16 - archive-uri: https://cache.haskellworks.io/archive + archive-uri: https://cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }} skip: "${{ secrets.BINARY_CACHE_URI != '' }}" - name: Build diff --git a/hw-prim.cabal b/hw-prim.cabal index 9d1298d..97d7268 100644 --- a/hw-prim.cabal +++ b/hw-prim.cabal @@ -13,7 +13,7 @@ maintainer: newhoggy@gmail.com copyright: 2016-2021 John Ky license: BSD-3-Clause license-file: LICENSE -tested-with: GHC == 9.4.2, GHC == 9.2.4, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4 +tested-with: GHC == 9.8.1, GHC == 9.6.3, GHC == 9.4.8, GHC == 9.2.8, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4 build-type: Simple extra-source-files: README.md @@ -28,15 +28,15 @@ flag bounds-checking-enabled common base { build-depends: base >= 4.11 && < 5 } -common bytestring { build-depends: bytestring >= 0.9 && < 0.12 } +common bytestring { build-depends: bytestring >= 0.9 && < 0.13 } common criterion { build-depends: criterion >= 1.2 && < 1.7 } -common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } +common deepseq { build-depends: deepseq >= 1.4 && < 1.6 } common directory { build-depends: directory >= 1.2 && < 1.4 } -common doctest { build-depends: doctest >= 0.16.2 && < 0.21 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.23 } common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } common exceptions { build-depends: exceptions >= 0.8 && < 0.11 } -common ghc-prim { build-depends: ghc-prim >= 0.5 && < 0.10 } -common hedgehog { build-depends: hedgehog >= 1.0 && < 1.3 } +common ghc-prim { build-depends: ghc-prim >= 0.5 && < 0.12 } +common hedgehog { build-depends: hedgehog >= 1.0 && < 1.5 } common hspec { build-depends: hspec >= 2.4 && < 3 } common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1 && < 0.2 } common mmap { build-depends: mmap >= 0.5 && < 0.6 }