From c391e4a249a61f86ff1fcb8fcdd3ba9c06a09b61 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sun, 27 Mar 2022 19:06:17 +0200 Subject: [PATCH] ci: add GHC9.0.2, bump 8.10.4 -> 8.10.7 --- .github/workflows/ci.dhall | 3 ++- .github/workflows/ci.yaml | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.dhall b/.github/workflows/ci.dhall index 2e98d45..ecb3d3f 100644 --- a/.github/workflows/ci.dhall +++ b/.github/workflows/ci.dhall @@ -4,7 +4,8 @@ in haskellCi.generalCi haskellCi.matrixSteps ( Some { ghc = - [ haskellCi.GHC.GHC8104 + [ haskellCi.GHC.GHC902 + , haskellCi.GHC.GHC8107 , haskellCi.GHC.GHC884 , haskellCi.GHC.GHC865 ] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b8c7ff7..1210682 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,12 +11,19 @@ jobs: ghc-version: "${{ matrix.ghc }}" - name: Update Hackage repository run: cabal update + - name: cabal.project.local.ci + run: | + if [ -e cabal.project.local.ci ]; then + cp cabal.project.local.ci cabal.project.local + fi - name: freeze run: cabal freeze - uses: "actions/cache@v2" with: key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}" - path: "${{ steps.setup-haskell-cabal.outputs.cabal-store }} dist-newstyle" + path: | + ${{ steps.setup-haskell-cabal.outputs.cabal-store }} + dist-newstyle - name: Install dependencies run: cabal build all --enable-tests --enable-benchmarks --only-dependencies - name: build all @@ -30,7 +37,8 @@ jobs: cabal: - '3.2' ghc: - - '8.10.4' + - '9.0.2' + - '8.10.7' - '8.8.4' - '8.6.5' name: Haskell CI