From f2d24e5c678bdde5329e3f5300f976e9e0d115cd Mon Sep 17 00:00:00 2001 From: John Ky Date: Sun, 7 Jan 2024 19:04:34 +1100 Subject: [PATCH] Update CI --- .github/workflows/haskell.yml | 30 ++++++++++++++++-------------- hw-int.cabal | 4 ++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index b482daa..e65a47d 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -17,27 +17,33 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.4.2", "9.2.4", "9.0.2", "8.10.7", "8.8.4", "8.6.5"] + 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: - - ghc: "9.4.2" - os: windows-latest + - 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.6.2.0 + cabal-version: '3.10.2.1' - name: Set some window specific things if: matrix.os == 'windows-latest' run: echo 'EXE_EXT=.exe' >> $GITHUB_ENV - name: Configure project - run: cabal configure --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+ + run: | + cabal configure --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+ + cabal build all --enable-tests --enable-benchmarks --dry-run - name: Cabal cache over S3 uses: action-works/cabal-cache-s3@v1 @@ -49,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 @@ -58,18 +64,14 @@ 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 - # Try building it twice in case of flakey builds on Windows - run: | - cabal build all --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+ || \ - cabal build all --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+ -j1 + run: cabal build all --enable-tests --enable-benchmarks - name: Test - run: | - cabal test all --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+ + run: cabal test all --enable-tests --enable-benchmarks check: needs: build diff --git a/hw-int.cabal b/hw-int.cabal index b96dd7b..b992b2e 100644 --- a/hw-int.cabal +++ b/hw-int.cabal @@ -23,9 +23,9 @@ source-repository head common base { build-depends: base >= 4.11 && < 5 } -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 hedgehog { build-depends: hedgehog >= 0.6 && < 1.3 } +common hedgehog { build-depends: hedgehog >= 0.6 && < 1.5 } common hspec { build-depends: hspec >= 2.7.1 && < 3 } common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.3 && < 0.2 } common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.1.1 && < 0.2 }