From 9501c8971129e20f8b3f1403396f220a4618afe0 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 6 Mar 2020 11:41:27 -0800
Subject: [PATCH] ;ci: github: windows tweaks

---
 .github/workflows/windows-ci.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
index f4c6969bc..a5abbef97 100644
--- a/.github/workflows/windows-ci.yml
+++ b/.github/workflows/windows-ci.yml
@@ -43,18 +43,24 @@ jobs:
 
     # cached things
 
-    - name: Cache C:\Users\runneradmin\AppData\Roaming\Programs\stack\
-      uses: actions/cache@v1
-      with:
-        path: C:\Users\runneradmin\AppData\Local\Roaming\stack\
-        key: ${{ runner.os }}-appdata-local-roaming-stack
-
     - name: Cache C:\Users\runneradmin\AppData\Local\Programs\stack\
       uses: actions/cache@v1
       with:
         path: C:\Users\runneradmin\AppData\Local\Programs\stack\
         key: ${{ runner.os }}-appdata-local-programs-stack
 
+    - name: Cache C:\Users\runneradmin\AppData\Local\Packages\
+      uses: actions/cache@v1
+      with:
+        path: C:\Users\runneradmin\AppData\Local\Packages\
+        key: ${{ runner.os }}-appdata-local-packages
+
+    - name: Cache C:\Users\runneradmin\AppData\Roaming\stack\
+      uses: actions/cache@v1
+      with:
+        path: C:\Users\runneradmin\AppData\Roaming\stack\
+        key: ${{ runner.os }}-appdata-roaming-stack
+
     - name: Cache .stack-work
       uses: actions/cache@v1
       with:
@@ -106,10 +112,10 @@ jobs:
         ls C:\Users\runneradmin\AppData\
         ls C:\Users\runneradmin\AppData\Local\
         ls C:\Users\runneradmin\AppData\Local\Programs\
+        ls C:\Users\runneradmin\AppData\Local\Programs\stack
         ls C:\Users\runneradmin\AppData\LocalLow\
         ls C:\Users\runneradmin\AppData\Roaming\
         ls C:\Users\runneradmin\AppData\Roaming\stack\
-        ls C:\Users\runneradmin\AppData\Roaming\stack\x86_64-windows\
 
     # - name: Install shelltestrunner
     # - if [[ ! -x ~/.local/bin/shelltest ]]; then stack install shelltestrunner-1.9; fi
@@ -131,10 +137,10 @@ jobs:
         ls C:\Users\runneradmin\AppData\
         ls C:\Users\runneradmin\AppData\Local\
         ls C:\Users\runneradmin\AppData\Local\Programs\
+        ls C:\Users\runneradmin\AppData\Local\Programs\stack
         ls C:\Users\runneradmin\AppData\LocalLow\
         ls C:\Users\runneradmin\AppData\Roaming\
         ls C:\Users\runneradmin\AppData\Roaming\stack\
-        ls C:\Users\runneradmin\AppData\Roaming\stack\x86_64-windows\
 
     # run hledger-lib/hledger functional tests, skipping the ones for addons
     #- COLUMNS=80 stack exec -- shelltest --execdir -j16 tests -x /bin -x /addons