Merge remote-tracking branch 'upstream/ghc-head' into ghc-head

1 files changed, 17 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