Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -2,11 +2,12 @@ steps:
 - script: |
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true

build/azure-pipelines/linux/multiarch/arm64/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/prebuild.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/publish.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+echo 'noop'

build/azure-pipelines/linux/product-build-linux-multiarch.yml

@@ -2,11 +2,12 @@ steps:
 - script: |
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
@@ -112,4 +113,4 @@ steps:
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'
-  continueOnError: true
+  continueOnError: true

build/azure-pipelines/linux/product-build-linux.yml

@@ -2,11 +2,12 @@ steps:
 - script: |
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true

build/azure-pipelines/product-build.yml

@@ -66,6 +66,17 @@ jobs:
   steps:
   - template: linux/product-build-linux-multiarch.yml
 
+- job: LinuxArm64
+  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: arm64
+  dependsOn:
+  - Compile
+  steps:
+  - template: linux/product-build-linux-multiarch.yml
+
 - job: LinuxAlpine
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
   pool:
@@ -128,6 +139,9 @@ jobs:
   steps:
   - template: sync-mooncake.yml
 
+trigger: none
+pr: none
+
 schedules:
 - cron: "0 5 * * Mon-Fri"
   displayName: Mon-Fri at 7:00

build/azure-pipelines/product-compile.yml

@@ -2,11 +2,12 @@ steps:
 - script: |
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
@@ -116,9 +117,9 @@ steps:
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
     alias: 'Compilation'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
+  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))

build/azure-pipelines/upload-sourcemaps.js

@@ -13,19 +13,37 @@ const util = require('../lib/util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 
-function main() {
-	const vs = vfs.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' }) // client source-maps only
+// optionally allow to pass in explicit base/maps to upload
+const [, , base, maps] = process.argv;
+
+const fetch = function (base, maps = `${base}/**/*.map`) {
+	return vfs.src(maps, { base })
 		.pipe(es.mapSync(f => {
 			f.path = `${f.base}/core/${f.relative}`;
 			return f;
 		}));
+};
 
-	const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+function main() {
+	const sources = [];
 
-	return es.merge(vs, extensionsOut)
+	// vscode client maps (default)
+	if (!base) {
+		const vs = fetch('out-vscode-min'); // client source-maps only
+		sources.push(vs);
+
+		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
+		sources.push(extensionsOut);
+	}
+
+	// specific client base/maps
+	else {
+		sources.push(fetch(base, maps));
+	}
+
+	return es.merge(...sources)
 		.pipe(es.through(function (data) {
-			// debug
-			console.log('Uploading Sourcemap', data.relative);
+			console.log('Uploading Sourcemap', data.relative); // debug
 			this.emit('data', data);
 		}))
 		.pipe(azure.upload({
@@ -36,4 +54,4 @@ function main() {
 		}));
 }
 
-main();
+main();

build/azure-pipelines/web/product-build-web.yml

@@ -2,11 +2,12 @@ steps:
 - script: |
     mkdir -p .build
     echo -n $BUILD_SOURCEVERSION > .build/commit
+    echo -n $VSCODE_QUALITY > .build/quality
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true
@@ -87,6 +88,15 @@ steps:
       yarn gulp vscode-web-min-ci
   displayName: Build
 
+  # upload only the workbench.web.api.js source maps because
+  # we just compiled these bits in the previous step and the
+  # general task to upload source maps has already been run
+- script: |
+    set -e
+    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+      node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
+  displayName: Upload sourcemaps (Web)
+
 - script: |
     set -e
     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \

build/azure-pipelines/win32/product-build-win32.yml

@@ -2,11 +2,12 @@ steps:
 - powershell: |
     mkdir .build -ea 0
     "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
+    "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality
   displayName: Prepare cache flag
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
   inputs:
-    keyfile: 'build/.cachesalt, .build/commit'
+    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
     targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
     vstsFeed: 'npm-vscode'
     platformIndependent: true