From 648090440f8edcce9ccf6c9da0e96d37c37ef82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= Date: Mon, 30 Nov 2020 14:56:10 +0100 Subject: [PATCH] caching is HARD --- build/azure-pipelines/darwin/product-build-darwin.yml | 7 +++++-- build/azure-pipelines/linux/product-build-alpine.yml | 7 +++++-- build/azure-pipelines/linux/product-build-linux.yml | 7 +++++-- build/azure-pipelines/web/product-build-web.yml | 7 +++++-- build/azure-pipelines/win32/product-build-win32.yml | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 659181ef46f..3c11fd0ed0f 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -4,8 +4,7 @@ steps: echo -n $BUILD_SOURCEVERSION > .build/commit echo -n $VSCODE_QUALITY > .build/quality echo -n $ENABLE_TERRAPIN > .build/terrapin - echo -n $(VSCODE_ARCH) > .build/arch - displayName: Prepare cache flag + displayName: Prepare compilation cache flags - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: @@ -67,6 +66,10 @@ steps: timeoutInMinutes: 5 condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) + - script: | + echo -n $(VSCODE_ARCH) > .build/arch + displayName: Prepare yarn cache flags + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" diff --git a/build/azure-pipelines/linux/product-build-alpine.yml b/build/azure-pipelines/linux/product-build-alpine.yml index a95fc03488a..8108ff8193d 100644 --- a/build/azure-pipelines/linux/product-build-alpine.yml +++ b/build/azure-pipelines/linux/product-build-alpine.yml @@ -4,8 +4,7 @@ steps: echo -n $BUILD_SOURCEVERSION > .build/commit echo -n $VSCODE_QUALITY > .build/quality echo -n $ENABLE_TERRAPIN > .build/terrapin - echo -n "alpine" > .build/arch - displayName: Prepare cache flag + displayName: Prepare compilation cache flags - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: @@ -70,6 +69,10 @@ steps: timeoutInMinutes: 5 condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) + - script: | + echo -n "alpine" > .build/arch + displayName: Prepare yarn cache flags + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 17d64b58ade..904fc6dda02 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -4,8 +4,7 @@ steps: echo -n $BUILD_SOURCEVERSION > .build/commit echo -n $VSCODE_QUALITY > .build/quality echo -n $ENABLE_TERRAPIN > .build/terrapin - echo -n $(VSCODE_ARCH) > .build/arch - displayName: Prepare cache flag + displayName: Prepare compilation cache flags - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: @@ -60,6 +59,10 @@ steps: timeoutInMinutes: 5 condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) + - script: | + echo -n $(VSCODE_ARCH) > .build/arch + displayName: Prepare yarn cache flags + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index 7bcba0d587f..1beae9506eb 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -4,8 +4,7 @@ steps: echo -n $BUILD_SOURCEVERSION > .build/commit echo -n $VSCODE_QUALITY > .build/quality echo -n $ENABLE_TERRAPIN > .build/terrapin - echo -n "web" > .build/arch - displayName: Prepare cache flag + displayName: Prepare compilation cache flag - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: @@ -60,6 +59,10 @@ steps: timeoutInMinutes: 5 condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) + - script: | + echo -n "web" > .build/arch + displayName: Prepare yarn cache flag + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 92aed795411..5c8806401d5 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -4,8 +4,7 @@ steps: "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin - "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch - displayName: Prepare cache flag + displayName: Prepare compilation cache flags - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: @@ -63,6 +62,10 @@ steps: timeoutInMinutes: 5 condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true')) + - powershell: | + "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch + displayName: Prepare yarn cache flags + - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 inputs: keyfile: ".build/arch, .build/terrapin, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"