From ddc3fb25b45fa147a658b69b3830b2b4d08fbdd8 Mon Sep 17 00:00:00 2001
From: ljnicol <ljnicol@users.noreply.github.com>
Date: Wed, 8 Apr 2020 13:16:26 +1000
Subject: [PATCH] Have another go at caching

---
 .github/workflows/release.yml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb5dfdd..1f64596 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,19 +35,15 @@ jobs:
     
     - name: Cache Stack downloads
       uses: actions/cache@v1
-      env:
-        cache-name: cache-stack-modules-linux
       with:
-        path: /$HOME/.stack/
-        key: download-cache-${{ hashFiles('**/stack.yaml.lock') }}
+        path: /{{$HOME}}/.stack/
+        key: ${{ runner.os }}-${{ hashFiles('**/stack.yaml.lock') }}
 
     - name: Cache Stack Build
       uses: actions/cache@v1
-      env:
-        cache-name: cache-stack-local-modules-linux
       with:
         path: ./hastile/.stack-work/
-        key: ${{ hashFiles('**/hastile.cabal') }}${{ hashFiles('**/stack.yaml.lock') }}
+        key: ${{ runner.os }}-${{ hashFiles('**/hastile.cabal') }}${{ hashFiles('**/stack.yaml.lock') }}
     
     - name: stack pre (setup, configure)
       run: |
@@ -109,19 +105,15 @@ jobs:
     
     - name: Cache Stack downloads
       uses: actions/cache@v1
-      env:
-        cache-name: cache-stack-modules-windows
       with:
         path: C:\Users\runneradmin\AppData\Roaming\stack
-        key: ${{ hashFiles('**/stack.yaml.lock') }}
+        key: ${{ runner.os }}-${{ hashFiles('**/stack.yaml.lock') }}
 
     - name: Cache Stack Build
       uses: actions/cache@v1
-      env:
-        cache-name: cache-stack-local-modules-windows
       with:
         path: ./hastile/.stack-work/
-        key: ${{ hashFiles('**/hastile.cabal') }}${{ hashFiles('**/stack.yaml.lock') }}
+        key: ${{ runner.os }}-${{ hashFiles('**/hastile.cabal') }}${{ hashFiles('**/stack.yaml.lock') }}
       
     - name: stack pre (setup, configure)
       run: |
@@ -175,19 +167,15 @@ jobs:
     
     - name: Cache Stack downloads
       uses: actions/cache@v1
-      env:
-        cache-name: cache-stack-modules-macos
       with:
-        path: /$HOME/.stack/
-        key: download-cache-${{ hashFiles('**/stack.yaml.lock') }}
+        path: /{{$HOME}}/.stack/
+        key: ${{ runner.os }}-${{ hashFiles('**/stack.yaml.lock') }}
 
     - name: Cache Stack Build
       uses: actions/cache@v1
-      env:
-        cache-name: cache-stack-local-modules-macos
       with:
         path: ./hastile/.stack-work/
-        key: ${{ hashFiles('**/hastile.cabal') }}${{ hashFiles('**/stack.yaml.lock') }}
+        key: ${{ runner.os }}-${{ hashFiles('**/hastile.cabal') }}${{ hashFiles('**/stack.yaml.lock') }}
       
     - name: stack pre (setup, configure)
       timeout-minutes: 720