From 3956c046c3bf81f6a9c82d3139ba07e86812cf26 Mon Sep 17 00:00:00 2001
From: David Himmelstrup <lemmih@gmail.com>
Date: Sat, 22 Aug 2020 13:00:25 +0800
Subject: [PATCH] CI: Change cache directories.

---
 .github/workflows/gh-pages.yml | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index acd21df..7aba40c 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -13,34 +13,21 @@ jobs:
     - uses: actions/setup-haskell@v1
       with:
         ghc-version: '8.8'
-        cabal-version: '3.0'
+        cabal-version: 'latest'
     - uses: jorelali/setup-elm@v2
       with:
         elm-version: 0.19.1
 
-    - name: Cache Cabal
-      uses: actions/cache@v1
-      env:
-        cache-name: cache-cabal
+    - name: Cache
+      uses: actions/cache@v2
       with:
-        path: ~/.cabal
-        key: ${{ runner.os }}-hpc-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
-
-    - name: Cache StackRoot
-      uses: actions/cache@v1
-      with:
-        path: ~/.stack
-        key: ${{ runner.os }}-${{ hashFiles('**/*.cabal') }}-stack
-
-    - name: Cache Stack
-      uses: actions/cache@v1
-      with:
-        path: ~/.stack-work
-        key: ${{ runner.os }}-${{ hashFiles('**/*.cabal') }}-stack-work
+        path: |
+          ~/.cabal
+          ~/.stack
+          ~/.stack-work
+          ~/.dist-newstyle
+          ~/.ghc
+        key: ${{ runner.os }}-${{ hashFiles('**/*.cabal') }}-cache
 
     - name: Install dependencies
       run: |