Revert "builds: disable caching"

This reverts commit 2ec3bfc440.
2021-11-24 13:04:43 +01:00 · 2021-11-24 13:04:43 +01:00 · 37f68b4803
parent edc966d289
commit 37f68b4803
6 changed files with 136 additions and 136 deletions
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@ -48,23 +48,23 @@ steps:
      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
    displayName: Merge distro

-  # - script: |
-  #     mkdir -p .build
-  #     node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
-  #   displayName: Prepare yarn cache flags
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags

-  # - task: Cache@2
-  #   inputs:
-  #     key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-  #     path: .build/node_modules_cache
-  #     cacheHitVar: NODE_MODULES_RESTORED
-  #   displayName: Restore node_modules cache
+  - task: Cache@2
+    inputs:
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

-  # - script: |
-  #     set -e
-  #     tar -xzf .build/node_modules_cache/cache.tgz
-  #   condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Extract node_modules cache
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

  - script: |
      set -e
@ -101,13 +101,13 @@ steps:
    displayName: Install dependencies
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  # - script: |
-  #     set -e
-  #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-  #     mkdir -p .build/node_modules_cache
-  #     tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Create node_modules archive
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration)
  - script: |
--- a/build/azure-pipelines/linux/product-build-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-alpine.yml
@ -47,23 +47,23 @@ steps:
      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
    displayName: Merge distro

-  # - script: |
-  #     mkdir -p .build
-  #     node build/azure-pipelines/common/computeNodeModulesCacheKey.js "alpine" $ENABLE_TERRAPIN > .build/yarnlockhash
-  #   displayName: Prepare yarn cache flags
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js "alpine" $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags

-  # - task: Cache@2
-  #   inputs:
-  #     key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-  #     path: .build/node_modules_cache
-  #     cacheHitVar: NODE_MODULES_RESTORED
-  #   displayName: Restore node_modules cache
+  - task: Cache@2
+    inputs:
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

-  # - script: |
-  #     set -e
-  #     tar -xzf .build/node_modules_cache/cache.tgz
-  #   condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Extract node_modules cache
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

  - script: |
      set -e
@ -89,13 +89,13 @@ steps:
    displayName: Install dependencies
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  # - script: |
-  #     set -e
-  #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-  #     mkdir -p .build/node_modules_cache
-  #     tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Create node_modules archive
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  - script: |
      set -e
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@ -38,23 +38,23 @@ steps:
      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
    displayName: Merge distro

-  # - script: |
-  #     mkdir -p .build
-  #     node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
-  #   displayName: Prepare yarn cache flags
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags

-  # - task: Cache@2
-  #   inputs:
-  #     key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-  #     path: .build/node_modules_cache
-  #     cacheHitVar: NODE_MODULES_RESTORED
-  #   displayName: Restore node_modules cache
+  - task: Cache@2
+    inputs:
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

-  # - script: |
-  #     set -e
-  #     tar -xzf .build/node_modules_cache/cache.tgz
-  #   condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Extract node_modules cache
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

  - script: |
      set -e
@ -110,13 +110,13 @@ steps:
    displayName: Install dependencies
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  # - script: |
-  #     set -e
-  #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-  #     mkdir -p .build/node_modules_cache
-  #     tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Create node_modules archive
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  - script: |
      set -e
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@ -27,24 +27,24 @@ steps:
      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
    displayName: Merge distro

-  # - script: |
-  #     mkdir -p .build
-  #     node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
-  #   displayName: Prepare yarn cache flags
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags

-  # # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
-  # - task: Cache@2
-  #   inputs:
-  #     key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
-  #     path: .build/node_modules_cache
-  #     cacheHitVar: NODE_MODULES_RESTORED
-  #   displayName: Restore node_modules cache
+  # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
+  - task: Cache@2
+    inputs:
+      key: "genericNodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

-  # - script: |
-  #     set -e
-  #     tar -xzf .build/node_modules_cache/cache.tgz
-  #   condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Extract node_modules cache
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

  - script: |
      set -e
@ -77,13 +77,13 @@ steps:
    displayName: Install dependencies
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  # - script: |
-  #     set -e
-  #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-  #     mkdir -p .build/node_modules_cache
-  #     tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Create node_modules archive
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  # Mixin must run before optimize, because the CSS loader will inline small SVGs
  - script: |
--- a/build/azure-pipelines/web/product-build-web.yml
+++ b/build/azure-pipelines/web/product-build-web.yml
@ -38,23 +38,23 @@ steps:
      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
    displayName: Merge distro

-  # - script: |
-  #     mkdir -p .build
-  #     node build/azure-pipelines/common/computeNodeModulesCacheKey.js "web" $ENABLE_TERRAPIN > .build/yarnlockhash
-  #   displayName: Prepare yarn cache flags
+  - script: |
+      mkdir -p .build
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js "web" $ENABLE_TERRAPIN > .build/yarnlockhash
+    displayName: Prepare yarn cache flags

-  # - task: Cache@2
-  #   inputs:
-  #     key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
-  #     path: .build/node_modules_cache
-  #     cacheHitVar: NODE_MODULES_RESTORED
-  #   displayName: Restore node_modules cache
+  - task: Cache@2
+    inputs:
+      key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

-  # - script: |
-  #     set -e
-  #     tar -xzf .build/node_modules_cache/cache.tgz
-  #   condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Extract node_modules cache
+  - script: |
+      set -e
+      tar -xzf .build/node_modules_cache/cache.tgz
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

  - script: |
      set -e
@ -80,13 +80,13 @@ steps:
    displayName: Install dependencies
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  # - script: |
-  #     set -e
-  #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-  #     mkdir -p .build/node_modules_cache
-  #     tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Create node_modules archive
+  - script: |
+      set -e
+      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+      mkdir -p .build/node_modules_cache
+      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  - script: |
      set -e
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@ -42,25 +42,25 @@ steps:
      exec { git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") }
    displayName: Merge distro

-  # - powershell: |
-  #     "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
-  #     "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin
-  #     node build/azure-pipelines/common/computeNodeModulesCacheKey.js > .build/yarnlockhash
-  #   displayName: Prepare yarn cache flags
+  - powershell: |
+      "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
+      "$env:ENABLE_TERRAPIN" | Out-File -Encoding ascii -NoNewLine .build\terrapin
+      node build/azure-pipelines/common/computeNodeModulesCacheKey.js > .build/yarnlockhash
+    displayName: Prepare yarn cache flags

-  # - task: Cache@2
-  #   inputs:
-  #     key: "nodeModules | $(Agent.OS) | .build/arch, .build/terrapin, .build/yarnlockhash"
-  #     path: .build/node_modules_cache
-  #     cacheHitVar: NODE_MODULES_RESTORED
-  #   displayName: Restore node_modules cache
+  - task: Cache@2
+    inputs:
+      key: "nodeModules | $(Agent.OS) | .build/arch, .build/terrapin, .build/yarnlockhash"
+      path: .build/node_modules_cache
+      cacheHitVar: NODE_MODULES_RESTORED
+    displayName: Restore node_modules cache

-  # - powershell: |
-  #     . build/azure-pipelines/win32/exec.ps1
-  #     $ErrorActionPreference = "Stop"
-  #     exec { 7z.exe x .build/node_modules_cache/cache.7z -aos }
-  #   condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Extract node_modules cache
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { 7z.exe x .build/node_modules_cache/cache.7z -aos }
+    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Extract node_modules cache

  - powershell: |
      . build/azure-pipelines/win32/exec.ps1
@ -84,14 +84,14 @@ steps:
    displayName: Install dependencies
    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

-  # - powershell: |
-  #     . build/azure-pipelines/win32/exec.ps1
-  #     $ErrorActionPreference = "Stop"
-  #     exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
-  #     exec { mkdir -Force .build/node_modules_cache }
-  #     exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
-  #   condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-  #   displayName: Create node_modules archive
+  - powershell: |
+      . build/azure-pipelines/win32/exec.ps1
+      $ErrorActionPreference = "Stop"
+      exec { node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt }
+      exec { mkdir -Force .build/node_modules_cache }
+      exec { 7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt }
+    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
+    displayName: Create node_modules archive

  - powershell: |
      . build/azure-pipelines/win32/exec.ps1