From 0cdbd3049b167ea01bf654aaad8b7cf7f3aa9f55 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 7 Mar 2020 13:34:23 -0800
Subject: [PATCH] ;ci: linux: reuse old caches once more to save rebuilding

---
 .github/workflows/linux-nightly.yml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml
index 7f7ff4520..a84022703 100644
--- a/.github/workflows/linux-nightly.yml
+++ b/.github/workflows/linux-nightly.yml
@@ -95,11 +95,9 @@ jobs:
       with:
         path: ~/.stack
         key:          ${{ runner.os }}-stack-global-${{ hashFiles('**.yaml') }}
-        restore-keys: ${{ runner.os }}-stack-global
-
-    - name: show stuff
-      run: |
-        if [[ -e ~/.stack ]]; then ls -lFRa ~/.stack; fi
+        restore-keys: |
+          ${{ runner.os }}-stack-global
+          ${{ runner.os }}-stack
 
     - name: Cache stack-installed programs in ~/.local/bin
       id:   stack-programs
@@ -107,11 +105,9 @@ jobs:
       with:
         path: ~/.local/bin
         key:          ${{ runner.os }}-stack-programs-${{ hashFiles('**.yaml') }}
-        restore-keys: ${{ runner.os }}-stack-programs
-
-    - name: show stuff
-      run: |
-        if [[ -e ~/.local/bin ]]; then ls -lFRa ~/.local/bin; fi
+        restore-keys: |
+          ${{ runner.os }}-stack-programs
+          ${{ runner.os }}-local-bin
 
     # stack's local package dbs for the project and each package
     - name: Cache .stack-work
@@ -201,3 +197,11 @@ jobs:
       # --no-print-missing-docs is 600% quieter
       env:
         ARGS: ${{ matrix.plan.resolver }}
+
+    - name: show stuff
+      run: |
+        if [[ -e ~/.stack ]]; then ls -lFRa ~/.stack; fi
+
+    - name: show stuff
+      run: |
+        if [[ -e ~/.local/bin ]]; then ls -lFRa ~/.local/bin; fi