aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHécate Moonlight <hecate+github@glitchbra.in>2021-01-22 21:44:44 +0100
committerHécate Moonlight <hecate+github@glitchbra.in>2021-02-05 14:53:00 +0100
commit664122f108c25fa2e96c9ea6d012d11d8faa2229 (patch)
tree930817bc1d97bc6851fe76e068623794ae11d3b6
parente88a63783fe716adbb96966c335f60009573dfc3 (diff)
Move CI to ghc-9.0
-rw-r--r--.github/workflows/ci.yml30
-rw-r--r--haddock-api/haddock-api.cabal1
2 files changed, 18 insertions, 13 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5b1bae2..b2b882e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ name: CI
on:
pull_request:
push:
- branches: ["ghc-8.10"]
+ branches: ["ghc-9.0"]
jobs:
cabal:
@@ -13,31 +13,36 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
- cabal: ["3.2"]
+ cabal: ["3.4"]
ghc:
- - "8.10.1"
- - "8.10.2"
+ - "9.0.1"
steps:
- uses: actions/checkout@v2
- if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/ghc-8.10'
+ if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/ghc-9.0'
- - uses: actions/setup-haskell@v1.1.4
+ - uses: haskell/actions/setup@v1
id: setup-haskell-cabal
name: Setup Haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
+ - name: Prepare environment
+ run: echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
+
+
- name: Freeze
run: |
cabal freeze
-
- - uses: actions/cache@v1
- name: Cache ~/.cabal/store
+
+ - uses: actions/cache@v2
+ name: Cache ~/.cabal/store and .ghcup
with:
- path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
- key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
+ path: |
+ ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
+ .ghcup
+ key: ${{ runner.os }}
- name: Build
run: |
@@ -45,5 +50,4 @@ jobs:
cabal build all
- name: Test
- run: |
- cabal test all
+ run: cabal test all
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 93f59c1f..f3dbe2e2 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -189,6 +189,7 @@ test-suite spec
, containers
, deepseq
, directory
+ , exceptions
, filepath
, ghc-boot
, transformers