From 5f21ef87e8d7057e3db6d74bde0fe6f9b67a577d Mon Sep 17 00:00:00 2001 From: Panu Horsmalahti Date: Mon, 23 Nov 2020 17:53:32 +0200 Subject: [PATCH] Revert "Upgrade cache pipeline task (#1366)" This reverts commit 88fb43b73bce73d1a516e479ecadf52819de73d7. --- .azure-pipelines.yml | 47 ++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 1f32789f4e..dc1f672475 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -1,5 +1,6 @@ variables: YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn + AZURE_CACHE_FOLDER: $(Pipeline.Workspace)/.azure-cache pr: - master - releases/* @@ -28,13 +29,11 @@ jobs: inputs: versionSpec: $(node_version) displayName: Install Node.js - - task: Cache@2 + - task: CacheBeta@0 inputs: key: yarn | $(Agent.OS) | yarn.lock - restoreKeys: | - yarn | "$(Agent.OS)" - yarn path: $(YARN_CACHE_FOLDER) + cacheHitVar: CACHE_RESTORED displayName: Cache Yarn packages - script: make install-deps displayName: Install dependencies @@ -68,14 +67,17 @@ jobs: inputs: versionSpec: $(node_version) displayName: Install Node.js - - task: Cache@2 + - task: CacheBeta@0 inputs: - key: yarn | $(Agent.OS) | yarn.lock - restoreKeys: | - yarn | "$(Agent.OS)" - yarn - path: $(YARN_CACHE_FOLDER) + key: cache | $(Agent.OS) | yarn.lock + path: $(AZURE_CACHE_FOLDER) + cacheHitVar: CACHE_RESTORED displayName: Cache Yarn packages + - bash: | + mkdir -p "$YARN_CACHE_FOLDER" + tar -xzf "$AZURE_CACHE_FOLDER/yarn-cache.tar.gz" -C / + displayName: "Unpack cache" + condition: eq(variables.CACHE_RESTORED, 'true') - script: make install-deps displayName: Install dependencies - script: make build-npm @@ -99,6 +101,10 @@ jobs: CSC_LINK: $(CSC_LINK) CSC_KEY_PASSWORD: $(CSC_KEY_PASSWORD) GH_TOKEN: $(GH_TOKEN) + - bash: | + mkdir -p "$AZURE_CACHE_FOLDER" + tar -czf "$AZURE_CACHE_FOLDER/yarn-cache.tar.gz" "$YARN_CACHE_FOLDER" + displayName: Pack cache - job: Linux pool: vmImage: ubuntu-16.04 @@ -114,14 +120,17 @@ jobs: inputs: versionSpec: $(node_version) displayName: Install Node.js - - task: Cache@2 + - task: CacheBeta@0 inputs: - key: yarn | $(Agent.OS) | yarn.lock - restoreKeys: | - yarn | "$(Agent.OS)" - yarn - path: $(YARN_CACHE_FOLDER) + key: cache | $(Agent.OS) | yarn.lock + path: $(AZURE_CACHE_FOLDER) + cacheHitVar: CACHE_RESTORED displayName: Cache Yarn packages + - bash: | + mkdir -p "$YARN_CACHE_FOLDER" + tar -xzf "$AZURE_CACHE_FOLDER/yarn-cache.tar.gz" -C / + displayName: "Unpack cache" + condition: eq(variables.CACHE_RESTORED, 'true') - script: make install-deps displayName: Install dependencies - script: make lint @@ -164,4 +173,8 @@ jobs: displayName: Publish npm package condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))" env: - NPM_TOKEN: $(NPM_TOKEN) \ No newline at end of file + NPM_TOKEN: $(NPM_TOKEN) + - bash: | + mkdir -p "$AZURE_CACHE_FOLDER" + tar -czf "$AZURE_CACHE_FOLDER/yarn-cache.tar.gz" "$YARN_CACHE_FOLDER" + displayName: Pack cache