diff --git a/.github/workflows/ci.dhall b/.github/workflows/ci.dhall index cc4837a..f6d57ef 100644 --- a/.github/workflows/ci.dhall +++ b/.github/workflows/ci.dhall @@ -4,12 +4,11 @@ in haskellCi.generalCi haskellCi.matrixSteps ( Some { ghc = - [ haskellCi.GHC.GHC902 + [ haskellCi.GHC.GHC947 + , haskellCi.GHC.GHC902 , haskellCi.GHC.GHC8107 - , haskellCi.GHC.GHC884 - , haskellCi.GHC.GHC865 ] - , cabal = [ haskellCi.Cabal.Cabal34 ] + , cabal = [ haskellCi.Cabal.Cabal310 ] } ) // { on = [ haskellCi.Event.push diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 56beccd..ae6467e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,7 +4,7 @@ jobs: steps: - uses: "actions/checkout@v3" - id: setup-haskell-cabal - uses: "haskell/actions/setup@v2" + uses: "haskell-actions/setup@v2" with: cabal-version: "${{ matrix.cabal }}" enable-stack: false @@ -17,7 +17,7 @@ jobs: cp cabal.project.local.ci cabal.project.local fi - name: freeze - run: cabal freeze + run: cabal freeze --enable-tests --enable-benchmarks - uses: "actions/cache@v3" with: key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}" @@ -35,12 +35,11 @@ jobs: strategy: matrix: cabal: - - '3.4' + - '3.10' ghc: + - '9.4.7' - '9.0.2' - '8.10.7' - - '8.8.4' - - '8.6.5' name: Haskell CI on: - push