Skip to content

Commit 3641b6b

Browse files
committed
Update bounds
1 parent 8f6f6e6 commit 3641b6b

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

.github/workflows/haskell.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8", "9.0.2", "8.10.7"]
21-
os: [ubuntu-latest, macOS-latest, windows-latest]
20+
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"]
21+
os: [ubuntu-latest]
22+
cabal: ["3.10.2.1"]
2223

2324
env:
2425
# Modify this value to "invalidate" the cabal cache.
25-
CABAL_CACHE_VERSION: "2024-01-05"
26+
CABAL_CACHE_VERSION: "2025-03-05"
2627

2728
steps:
2829
- uses: actions/checkout@v2
@@ -31,7 +32,7 @@ jobs:
3132
id: setup-haskell
3233
with:
3334
ghc-version: ${{ matrix.ghc }}
34-
cabal-version: '3.10.2.1'
35+
cabal-version: ${{ matrix.cabal}}
3536

3637
- name: Set some window specific things
3738
if: matrix.os == 'windows-latest'
@@ -47,22 +48,25 @@ jobs:
4748
env:
4849
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
4950
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
51+
BINARY_CACHE_URI: ${{ vars.BINARY_CACHE_URI }}
5052
with:
5153
region: us-west-2
5254
dist-dir: dist-newstyle
5355
store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
5456
threads: 16
55-
archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
56-
skip: "${{ secrets.BINARY_CACHE_URI == '' }}"
57+
archive-uri: ${{ env.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
58+
skip: "${{ env.BINARY_CACHE_URI == '' }}"
5759

5860
- name: Cabal cache over HTTPS
5961
uses: action-works/cabal-cache-s3@v1
62+
env:
63+
BINARY_CACHE_URI: ${{ vars.BINARY_CACHE_URI }}
6064
with:
6165
dist-dir: dist-newstyle
6266
store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
6367
threads: 16
6468
archive-uri: https://cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
65-
skip: "${{ secrets.BINARY_CACHE_URI != '' }}"
69+
skip: "${{ env.BINARY_CACHE_URI != '' }}"
6670

6771
- name: Build
6872
run: cabal build all --enable-tests --enable-benchmarks

bits-extra.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ flag bmi2
2929
common base { build-depends: base >= 4.11 && < 5 }
3030

3131
common criterion { build-depends: criterion >= 1.3 && < 1.7 }
32-
common doctest { build-depends: doctest >= 0.16.2 && < 0.23 }
32+
common doctest { build-depends: doctest >= 0.16.2 && < 0.25 }
3333
common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 }
34-
common ghc-prim { build-depends: ghc-prim >= 0.5 && < 0.12 }
35-
common hedgehog { build-depends: hedgehog >= 0.5.3 && < 1.5 }
34+
common ghc-prim { build-depends: ghc-prim >= 0.5 && < 0.14 }
35+
common hedgehog { build-depends: hedgehog >= 0.5.3 && < 1.6 }
3636
common hspec { build-depends: hspec >= 2.4 && < 3 }
3737
common hw-hedgehog { build-depends: hw-hedgehog >= 0.1 && < 0.2 }
3838
common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1 && < 0.2 }

0 commit comments

Comments
 (0)