From 01a1c9941c4571a272b9c653785555175f12fdf1 Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Tue, 9 Jul 2019 12:24:04 +0200
Subject: [PATCH] cleanup build cache paths

---
 build/.cachesalt                                          | 2 +-
 build/azure-pipelines/darwin/product-build-darwin.yml     | 4 ++--
 .../linux/product-build-linux-multiarch.yml               | 4 ++--
 build/azure-pipelines/linux/product-build-linux.yml       | 4 ++--
 build/azure-pipelines/product-compile.yml                 | 8 ++++----
 build/azure-pipelines/win32/product-build-win32.yml       | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/.cachesalt b/build/.cachesalt
index 56a6051ca2b..1d0bd9164e8 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-1
\ No newline at end of file
+2019-07-09T10:22:14.653Z
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index cdf7eb2f1df..01bb333120a 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -6,8 +6,8 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
+    keyfile: 'build/.cachesalt, .build/commit'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/linux/product-build-linux-multiarch.yml b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
index 66b6bbff713..139d926bf73 100644
--- a/build/azure-pipelines/linux/product-build-linux-multiarch.yml
+++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
@@ -6,8 +6,8 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
+    keyfile: 'build/.cachesalt, .build/commit'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 1e48713cd86..fd0f4347d4a 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -6,8 +6,8 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
+    keyfile: 'build/.cachesalt, .build/commit'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index cc2639f139c..27a8362dd3e 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -6,8 +6,8 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
+    keyfile: 'build/.cachesalt, .build/commit'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
@@ -112,8 +112,8 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
   inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
+    keyfile: 'build/.cachesalt, .build/commit'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 66d8bf4af32..89c85d866ad 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -6,8 +6,8 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: '.build/commit'
-    targetfolder: '.build, **/out-build, **/out-vscode-min, **/out-vscode-reh-min, **/out-vscode-web-min'
+    keyfile: 'build/.cachesalt, .build/commit'
+    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
-- 
GitLab