From cab65cd9c6a7578b897d78be92f71e9deadb4abf Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Tue, 16 Jul 2019 13:54:34 +0200
Subject: [PATCH 01/13] Add cache for stack-root and stack-work

---
 .azure/linux-stack.yml   | 14 ++++++++++++++
 .azure/macos-stack.yml   | 14 ++++++++++++++
 .azure/windows-stack.yml | 14 ++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index a7e636913..1276b7c07 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -26,6 +26,20 @@ jobs:
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
   steps:
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: $(Build.SourcesDirectory)/.stack-root
+    displayName: "Cache stack-root"
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: .stack-work
+    displayName: "Cache stack-work"
   - bash: |
       git submodule sync
       git submodule update --init
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index 86644471e..f2d0d98d5 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -22,6 +22,20 @@ jobs:
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
   steps:
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: $(Build.SourcesDirectory)/.stack-root
+    displayName: "Cache stack-root"
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: .stack-work
+    displayName: "Cache stack-work"
   - bash: |
       git submodule sync
       git submodule update --init
diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml
index 4187ec03c..759f7d66b 100644
--- a/.azure/windows-stack.yml
+++ b/.azure/windows-stack.yml
@@ -24,6 +24,20 @@ jobs:
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
   steps:
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: "C:\\sr"
+    displayName: "Cache stack-root"
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: .stack-work
+    displayName: "Cache stack-work"
   - bash: |
       git submodule sync
       git submodule update --init

From 78b443c993181e668d39c3e6dbc8f5dbcefe88b0 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Tue, 16 Jul 2019 23:18:45 +0200
Subject: [PATCH 02/13] Add name as key and move STACK_ROOT to variables

---
 .azure/linux-stack.yml   | 7 +++++--
 .azure/macos-stack.yml   | 7 +++++--
 .azure/windows-stack.yml | 7 ++++++-
 .azure/windows.bashrc    | 1 -
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 1276b7c07..40fe52a8e 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -25,17 +25,21 @@ jobs:
         YAML_FILE: stack-8.4.2.yaml
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
+  variables:
+    STACK_ROOT: $(Build.SourcesDirectory)/.stack-root
   steps:
   - task: CacheBeta@0
     inputs:
       key: |
+        "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(Build.SourcesDirectory)/.stack-root
+      path: $(STACK_ROOT)
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
       key: |
+        "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .stack-work
@@ -45,7 +49,6 @@ jobs:
       git submodule update --init
     displayName: Sync submodules
   - bash: |
-      export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root
       mkdir -p ~/.local/bin
       curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | \
         tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index f2d0d98d5..3068687a3 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -21,17 +21,21 @@ jobs:
         YAML_FILE: stack-8.4.2.yaml
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
+  variables:
+    STACK_ROOT: $(Build.SourcesDirectory)/.stack-root
   steps:
   - task: CacheBeta@0
     inputs:
       key: |
+        "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(Build.SourcesDirectory)/.stack-root
+      path: $(STACK_ROOT)
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
       key: |
+        "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .stack-work
@@ -41,7 +45,6 @@ jobs:
       git submodule update --init
     displayName: Sync submodules
   - bash: |
-      export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root
       mkdir -p ~/.local/bin
       curl -skL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | \
         tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml
index 759f7d66b..1dec036dc 100644
--- a/.azure/windows-stack.yml
+++ b/.azure/windows-stack.yml
@@ -23,17 +23,22 @@ jobs:
         YAML_FILE: stack-8.4.2.yaml
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
+  variables:
+    STACK_ROOT: "C:\\sr"
+
   steps:
   - task: CacheBeta@0
     inputs:
       key: |
+        "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: "C:\\sr"
+      path: $(STACK_ROOT)
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
       key: |
+        "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .stack-work
diff --git a/.azure/windows.bashrc b/.azure/windows.bashrc
index 8de96772d..724f2795d 100644
--- a/.azure/windows.bashrc
+++ b/.azure/windows.bashrc
@@ -1,4 +1,3 @@
-export STACK_ROOT="C:\\sr"
 export LOCAL_BIN_PATH=$(cygpath $APPDATA\\local\\bin)
 export Z3_BIN_PATH=/usr/local/z3-4.8.5-x64-win/bin
 export PATH=$Z3_BIN_PATH:$LOCAL_BIN_PATH:$PATH

From efb4838044bbc4da90033ca0268ae7db68d2b49a Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Thu, 18 Jul 2019 14:19:11 +0200
Subject: [PATCH 03/13] Delete ghc at the end

---
 .azure/linux-stack.yml |  5 ++++-
 .azure/macos-stack.yml | 13 ++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 40fe52a8e..45e580ebb 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -26,7 +26,7 @@ jobs:
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
   variables:
-    STACK_ROOT: $(Build.SourcesDirectory)/.stack-root
+    STACK_ROOT: /home/vsts/.stack
   steps:
   - task: CacheBeta@0
     inputs:
@@ -83,3 +83,6 @@ jobs:
   #     source .azure/linux.bashrc
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
+  - bash: |
+      rm -rf $STACK_ROOT/programs
+    displayName: "Clean STACK_ROOT programs"
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index 3068687a3..d9834b52e 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -22,7 +22,7 @@ jobs:
       stack-8.2.2:
         YAML_FILE: stack-8.2.2.yaml
   variables:
-    STACK_ROOT: $(Build.SourcesDirectory)/.stack-root
+    STACK_ROOT: /Users/vsts/.stack
   steps:
   - task: CacheBeta@0
     inputs:
@@ -32,14 +32,6 @@ jobs:
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: $(STACK_ROOT)
     displayName: "Cache stack-root"
-  - task: CacheBeta@0
-    inputs:
-      key: |
-        "stack-work"
-        $(Agent.OS)
-        $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work
-    displayName: "Cache stack-work"
   - bash: |
       git submodule sync
       git submodule update --init
@@ -80,3 +72,6 @@ jobs:
   #     source .azure/macos.bashrc
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
+  - bash: |
+      rm -rf $STACK_ROOT/programs
+    displayName: "Clean STACK_ROOT programs"

From 19f3b129bda1272c33a0e099ffc78ba7f2151d36 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Thu, 18 Jul 2019 23:02:01 +0200
Subject: [PATCH 04/13] Delete setup-exe-cache

---
 .azure/linux-stack.yml | 1 +
 .azure/macos-stack.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 45e580ebb..d87e635fc 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -85,4 +85,5 @@ jobs:
   #   displayName: Run Test
   - bash: |
       rm -rf $STACK_ROOT/programs
+      rm -rf $STACK_ROOT/setup-exe-cache
     displayName: "Clean STACK_ROOT programs"
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index d9834b52e..b35fe18a7 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -74,4 +74,5 @@ jobs:
   #   displayName: Run Test
   - bash: |
       rm -rf $STACK_ROOT/programs
+      rm -rf $STACK_ROOT/setup-exe-cache
     displayName: "Clean STACK_ROOT programs"

From 7f895f33f1b5e14b0784dd22b8d0fad0de74705c Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Thu, 18 Jul 2019 23:27:10 +0200
Subject: [PATCH 05/13] Clean exec at the start

---
 .azure/linux-stack.yml |  4 ++++
 .azure/macos-stack.yml | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index d87e635fc..88d2988be 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -44,6 +44,10 @@ jobs:
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .stack-work
     displayName: "Cache stack-work"
+  - bash: |
+      rm -rf $STACK_ROOT/programs
+      rm -rf $STACK_ROOT/setup-exe-cache
+    displayName: "Clean STACK_ROOT programs"
   - bash: |
       git submodule sync
       git submodule update --init
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index b35fe18a7..86a823aa4 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -32,6 +32,18 @@ jobs:
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: $(STACK_ROOT)
     displayName: "Cache stack-root"
+  - task: CacheBeta@0
+    inputs:
+      key: |
+        "stack-work"
+        $(Agent.OS)
+        $(Build.SourcesDirectory)/$(YAML_FILE)
+      path: .stack-work
+    displayName: "Cache stack-work"
+  - bash: |
+      rm -rf $STACK_ROOT/programs
+      rm -rf $STACK_ROOT/setup-exe-cache
+    displayName: "Clean STACK_ROOT programs"
   - bash: |
       git submodule sync
       git submodule update --init

From 65c1249f6a91c9ed85aa5369bdb7f506a016f47f Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Fri, 19 Jul 2019 08:41:35 +0200
Subject: [PATCH 06/13] Pack/unpack cache to keep files attributes, see
 https://github.com/microsoft/azure-pipelines-tasks/issues/10841

---
 .azure/linux-stack.yml | 19 +++++++++++--------
 .azure/macos-stack.yml | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 88d2988be..d52a9e7bf 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -34,7 +34,7 @@ jobs:
         "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(STACK_ROOT)
+      path: $(STACK_ROOT).tar.gz
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
@@ -42,12 +42,15 @@ jobs:
         "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work
+      path: .stack-work.tar.gz
     displayName: "Cache stack-work"
   - bash: |
-      rm -rf $STACK_ROOT/programs
-      rm -rf $STACK_ROOT/setup-exe-cache
-    displayName: "Clean STACK_ROOT programs"
+      mkdir -p $STACK_ROOT
+      tar -xzf $STACK_ROOT.tar.gz -C $STACK_ROOT/..
+      mkdir -p .stack-work
+      tar -xzf .stack-work.tar.gz
+    displayName: "Unpack cache"
+    condition: eq(variables.CACHE_RESTORED, 'true')
   - bash: |
       git submodule sync
       git submodule update --init
@@ -88,6 +91,6 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      rm -rf $STACK_ROOT/programs
-      rm -rf $STACK_ROOT/setup-exe-cache
-    displayName: "Clean STACK_ROOT programs"
+      tar -czf $STACK_ROOT.tar.gz $STACK_ROOT
+      tar -czf .stack-work.tar.gz .stack-work
+    displayName: "Pack cache"
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index 86a823aa4..4bb9587f4 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -30,7 +30,7 @@ jobs:
         "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(STACK_ROOT)
+      path: $(STACK_ROOT).tar.gz
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
@@ -38,12 +38,15 @@ jobs:
         "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work
+      path: .stack-work.tar.gz
     displayName: "Cache stack-work"
   - bash: |
-      rm -rf $STACK_ROOT/programs
-      rm -rf $STACK_ROOT/setup-exe-cache
-    displayName: "Clean STACK_ROOT programs"
+      mkdir -p $STACK_ROOT
+      tar -xzf $STACK_ROOT.tar.gz -C $STACK_ROOT/..
+      mkdir -p .stack-work
+      tar -xzf .stack-work.tar.gz
+    displayName: "Unpack cache"
+    condition: eq(variables.CACHE_RESTORED, 'true')
   - bash: |
       git submodule sync
       git submodule update --init
@@ -85,6 +88,6 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      rm -rf $STACK_ROOT/programs
-      rm -rf $STACK_ROOT/setup-exe-cache
-    displayName: "Clean STACK_ROOT programs"
+      tar -czf $STACK_ROOT.tar.gz $STACK_ROOT
+      tar -czf .stack-work.tar.gz .stack-work
+    displayName: "Pack cache"

From b639b2140bb2a29c0f41506684d7fde22e5e96bf Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Fri, 19 Jul 2019 11:32:17 +0200
Subject: [PATCH 07/13] Add cacheHitVar to make conditions work

---
 .azure/linux-stack.yml | 9 +++++++--
 .azure/macos-stack.yml | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index d52a9e7bf..836637447 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -35,6 +35,7 @@ jobs:
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: $(STACK_ROOT).tar.gz
+      cacheHitVar: STACK_ROOT_RESTORED
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
@@ -43,14 +44,18 @@ jobs:
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .stack-work.tar.gz
+      cacheHitVar: STACK_WORK_RESTORED
     displayName: "Cache stack-work"
   - bash: |
       mkdir -p $STACK_ROOT
       tar -xzf $STACK_ROOT.tar.gz -C $STACK_ROOT/..
+    displayName: "Unpack STACK_ROOT cache"
+    condition: eq(variables.STACK_ROOT_RESTORED, 'true')
+  - bash: |
       mkdir -p .stack-work
       tar -xzf .stack-work.tar.gz
-    displayName: "Unpack cache"
-    condition: eq(variables.CACHE_RESTORED, 'true')
+    displayName: "Unpack .stack-work cache"
+    condition: eq(variables.STACK_WORK_RESTORED, 'true')
   - bash: |
       git submodule sync
       git submodule update --init
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index 4bb9587f4..78dca7d72 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -31,6 +31,7 @@ jobs:
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: $(STACK_ROOT).tar.gz
+      cacheHitVar: STACK_ROOT_RESTORED
     displayName: "Cache stack-root"
   - task: CacheBeta@0
     inputs:
@@ -39,14 +40,18 @@ jobs:
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .stack-work.tar.gz
+      cacheHitVar: STACK_WORK_RESTORED
     displayName: "Cache stack-work"
   - bash: |
       mkdir -p $STACK_ROOT
       tar -xzf $STACK_ROOT.tar.gz -C $STACK_ROOT/..
+    displayName: "Unpack STACK_ROOT cache"
+    condition: eq(variables.STACK_ROOT_RESTORED, 'true')
+  - bash: |
       mkdir -p .stack-work
       tar -xzf .stack-work.tar.gz
-    displayName: "Unpack cache"
-    condition: eq(variables.CACHE_RESTORED, 'true')
+    displayName: "Unpack .stack-work cache"
+    condition: eq(variables.STACK_WORK_RESTORED, 'true')
   - bash: |
       git submodule sync
       git submodule update --init

From 3db2e7f8bfad81442ed50c58d33dcfc5821bdcb8 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Fri, 19 Jul 2019 12:15:38 +0200
Subject: [PATCH 08/13] Change file extension to avoid docker auto extraction

---
 .azure/linux-stack.yml | 12 ++++++------
 .azure/macos-stack.yml | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 836637447..ed7c94d89 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -34,7 +34,7 @@ jobs:
         "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(STACK_ROOT).tar.gz
+      path: $(STACK_ROOT).cache
       cacheHitVar: STACK_ROOT_RESTORED
     displayName: "Cache stack-root"
   - task: CacheBeta@0
@@ -43,17 +43,17 @@ jobs:
         "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work.tar.gz
+      path: .stack-work.cache
       cacheHitVar: STACK_WORK_RESTORED
     displayName: "Cache stack-work"
   - bash: |
       mkdir -p $STACK_ROOT
-      tar -xzf $STACK_ROOT.tar.gz -C $STACK_ROOT/..
+      tar -xzf $STACK_ROOT.cache -C $STACK_ROOT/..
     displayName: "Unpack STACK_ROOT cache"
     condition: eq(variables.STACK_ROOT_RESTORED, 'true')
   - bash: |
       mkdir -p .stack-work
-      tar -xzf .stack-work.tar.gz
+      tar -xzf .stack-work.cache
     displayName: "Unpack .stack-work cache"
     condition: eq(variables.STACK_WORK_RESTORED, 'true')
   - bash: |
@@ -96,6 +96,6 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      tar -czf $STACK_ROOT.tar.gz $STACK_ROOT
-      tar -czf .stack-work.tar.gz .stack-work
+      tar -czf $STACK_ROOT.cache $STACK_ROOT
+      tar -czf .stack-work.cache .stack-work
     displayName: "Pack cache"
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index 78dca7d72..f5f3f2d8d 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -30,7 +30,7 @@ jobs:
         "stack-root"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(STACK_ROOT).tar.gz
+      path: $(STACK_ROOT).cache
       cacheHitVar: STACK_ROOT_RESTORED
     displayName: "Cache stack-root"
   - task: CacheBeta@0
@@ -39,17 +39,17 @@ jobs:
         "stack-work"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work.tar.gz
+      path: .stack-work.cache
       cacheHitVar: STACK_WORK_RESTORED
     displayName: "Cache stack-work"
   - bash: |
       mkdir -p $STACK_ROOT
-      tar -xzf $STACK_ROOT.tar.gz -C $STACK_ROOT/..
+      tar -xzf $STACK_ROOT.cache -C $STACK_ROOT/..
     displayName: "Unpack STACK_ROOT cache"
     condition: eq(variables.STACK_ROOT_RESTORED, 'true')
   - bash: |
       mkdir -p .stack-work
-      tar -xzf .stack-work.tar.gz
+      tar -xzf .stack-work.cache
     displayName: "Unpack .stack-work cache"
     condition: eq(variables.STACK_WORK_RESTORED, 'true')
   - bash: |
@@ -93,6 +93,6 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      tar -czf $STACK_ROOT.tar.gz $STACK_ROOT
-      tar -czf .stack-work.tar.gz .stack-work
+      tar -czf $STACK_ROOT.cache $STACK_ROOT
+      tar -czf .stack-work.cache .stack-work
     displayName: "Pack cache"

From 7ddebe18afa37544902b8a80f1f9e5a1eb4db9cc Mon Sep 17 00:00:00 2001
From: Javier Neira <atreyu.bbb@gmail.com>
Date: Fri, 19 Jul 2019 18:35:44 +0200
Subject: [PATCH 09/13] Put tar files inside a dir

---
 .azure/linux-stack.yml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index ed7c94d89..b7ffb4d0e 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -31,31 +31,19 @@ jobs:
   - task: CacheBeta@0
     inputs:
       key: |
-        "stack-root"
+        "cache"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(STACK_ROOT).cache
-      cacheHitVar: STACK_ROOT_RESTORED
-    displayName: "Cache stack-root"
-  - task: CacheBeta@0
-    inputs:
-      key: |
-        "stack-work"
-        $(Agent.OS)
-        $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work.cache
-      cacheHitVar: STACK_WORK_RESTORED
-    displayName: "Cache stack-work"
+      path: .azure-cache
+      cacheHitVar: _RESTORED
+    displayName: "Download cache"
   - bash: |
       mkdir -p $STACK_ROOT
-      tar -xzf $STACK_ROOT.cache -C $STACK_ROOT/..
-    displayName: "Unpack STACK_ROOT cache"
-    condition: eq(variables.STACK_ROOT_RESTORED, 'true')
-  - bash: |
+      tar -xzf .azure-cache/stack-root.tar.gz -C $STACK_ROOT/..
       mkdir -p .stack-work
-      tar -xzf .stack-work.cache
-    displayName: "Unpack .stack-work cache"
-    condition: eq(variables.STACK_WORK_RESTORED, 'true')
+      tar -xzf .azure-cache/stack-work.tar.gz
+    displayName: "Unpack cache"
+    condition: eq(variables.CACHE_RESTORED, 'true')
   - bash: |
       git submodule sync
       git submodule update --init
@@ -96,6 +84,7 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      tar -czf $STACK_ROOT.cache $STACK_ROOT
-      tar -czf .stack-work.cache .stack-work
+      mkdir .azure-cache
+      tar -czf .azure-cache/stack-root.tar.gz $STACK_ROOT
+      tar -czf .azure-cache/stack-work.tar.gz .stack-work
     displayName: "Pack cache"

From 8c787c68a138330d0739fe7225ee874cd2e1d89f Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Sat, 20 Jul 2019 09:47:52 +0200
Subject: [PATCH 10/13] Fix cache hit var name

---
 .azure/linux-stack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index b7ffb4d0e..19dacd809 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -35,7 +35,7 @@ jobs:
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
       path: .azure-cache
-      cacheHitVar: _RESTORED
+      cacheHitVar: CACHE_RESTORED
     displayName: "Download cache"
   - bash: |
       mkdir -p $STACK_ROOT

From 6dde4cc8dcaba9c2d48f1bc4b6beeae0a3aa921c Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Sun, 21 Jul 2019 16:28:25 +0200
Subject: [PATCH 11/13] Extract in the correct dir

---
 .azure/linux-stack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 19dacd809..0a5c56919 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -39,7 +39,7 @@ jobs:
     displayName: "Download cache"
   - bash: |
       mkdir -p $STACK_ROOT
-      tar -xzf .azure-cache/stack-root.tar.gz -C $STACK_ROOT/..
+      tar -xzf .azure-cache/stack-root.tar.gz -C /
       mkdir -p .stack-work
       tar -xzf .azure-cache/stack-work.tar.gz
     displayName: "Unpack cache"

From 6a976ab84f24bfcb946a39b4a1bc98c651147711 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Sun, 21 Jul 2019 20:55:16 +0200
Subject: [PATCH 12/13] Apply changes from linux to macos

---
 .azure/macos-stack.yml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index f5f3f2d8d..68671d16e 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -27,31 +27,19 @@ jobs:
   - task: CacheBeta@0
     inputs:
       key: |
-        "stack-root"
+        "cache"
         $(Agent.OS)
         $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: $(STACK_ROOT).cache
-      cacheHitVar: STACK_ROOT_RESTORED
-    displayName: "Cache stack-root"
-  - task: CacheBeta@0
-    inputs:
-      key: |
-        "stack-work"
-        $(Agent.OS)
-        $(Build.SourcesDirectory)/$(YAML_FILE)
-      path: .stack-work.cache
-      cacheHitVar: STACK_WORK_RESTORED
-    displayName: "Cache stack-work"
+      path: .azure-cache
+      cacheHitVar: CACHE_RESTORED
+    displayName: "Download cache"
   - bash: |
       mkdir -p $STACK_ROOT
-      tar -xzf $STACK_ROOT.cache -C $STACK_ROOT/..
-    displayName: "Unpack STACK_ROOT cache"
-    condition: eq(variables.STACK_ROOT_RESTORED, 'true')
-  - bash: |
+      tar -xzf .azure-cache/stack-root.tar.gz -C /
       mkdir -p .stack-work
-      tar -xzf .stack-work.cache
-    displayName: "Unpack .stack-work cache"
-    condition: eq(variables.STACK_WORK_RESTORED, 'true')
+      tar -xzf .azure-cache/stack-work.tar.gz
+    displayName: "Unpack cache"
+    condition: eq(variables.CACHE_RESTORED, 'true')
   - bash: |
       git submodule sync
       git submodule update --init
@@ -93,6 +81,7 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      tar -czf $STACK_ROOT.cache $STACK_ROOT
-      tar -czf .stack-work.cache .stack-work
+      mkdir .azure-cache
+      tar -czf .azure-cache/stack-root.tar.gz $STACK_ROOT
+      tar -czf .azure-cache/stack-work.tar.gz .stack-work
     displayName: "Pack cache"

From e077fd85f28d26c8e06b5d60218f4ffafc72497f Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Tue, 23 Jul 2019 00:00:22 +0200
Subject: [PATCH 13/13] Avoid unnecessary error creating cache dir

---
 .azure/linux-stack.yml | 2 +-
 .azure/macos-stack.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml
index 0a5c56919..5b88f37b4 100644
--- a/.azure/linux-stack.yml
+++ b/.azure/linux-stack.yml
@@ -84,7 +84,7 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      mkdir .azure-cache
+      mkdir -p .azure-cache
       tar -czf .azure-cache/stack-root.tar.gz $STACK_ROOT
       tar -czf .azure-cache/stack-work.tar.gz .stack-work
     displayName: "Pack cache"
diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml
index 68671d16e..fa005842f 100644
--- a/.azure/macos-stack.yml
+++ b/.azure/macos-stack.yml
@@ -81,7 +81,7 @@ jobs:
   #     stack test --stack-yaml $(YAML_FILE)
   #   displayName: Run Test
   - bash: |
-      mkdir .azure-cache
+      mkdir -p .azure-cache
       tar -czf .azure-cache/stack-root.tar.gz $STACK_ROOT
       tar -czf .azure-cache/stack-work.tar.gz .stack-work
     displayName: "Pack cache"