Merge branch 'joao/release'

build/azure-pipelines/common/publish.ts

@@ -151,13 +151,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 
 	const queuedBy = process.env['BUILD_QUEUEDBY']!;
 	const sourceBranch = process.env['BUILD_SOURCEBRANCH']!;
-	const isReleased = (
-		// Insiders: nightly build from master
-		(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch) && /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)) ||
-
-		// Exploration: any build from electron-4.0.x branch
-		(quality === 'exploration' && /^electron-4.0.x$|^refs\/heads\/electron-4.0.x$/.test(sourceBranch))
-	);
 
 	console.log('Publishing...');
 	console.log('Quality:', quality);
@@ -167,7 +160,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('Version:', version);
 	console.log('Commit:', commit);
 	console.log('Is Update:', isUpdate);
-	console.log('Is Released:', isReleased);
 	console.log('File:', file);
 
 	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
@@ -226,7 +218,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 		id: commit,
 		timestamp: (new Date()).getTime(),
 		version,
-		isReleased: config.frozen ? false : isReleased,
+		isReleased: false,
 		sourceBranch,
 		queuedBy,
 		assets: [] as Array<Asset>,
@@ -245,11 +237,6 @@ async function publish(commit: string, quality: string, platform: string, type:
 }
 
 function main(): void {
-	if (process.env['VSCODE_BUILD_SKIP_PUBLISH']) {
-		console.warn('Skipping publish due to VSCODE_BUILD_SKIP_PUBLISH');
-		return;
-	}
-
 	const commit = process.env['BUILD_SOURCEVERSION'];
 
 	if (!commit) {

build/azure-pipelines/common/release.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { DocumentClient } from 'documentdb';
+
+interface Config {
+	id: string;
+	frozen: boolean;
+}
+
+function createDefaultConfig(quality: string): Config {
+	return {
+		id: quality,
+		frozen: false
+	};
+}
+
+function getConfig(quality: string): Promise<Config> {
+	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+	const collection = 'dbs/builds/colls/config';
+	const query = {
+		query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
+		parameters: [
+			{ name: '@quality', value: quality }
+		]
+	};
+
+	return new Promise<Config>((c, e) => {
+		client.queryDocuments(collection, query).toArray((err, results) => {
+			if (err && err.code !== 409) { return e(err); }
+
+			c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0] as any as Config);
+		});
+	});
+}
+
+function doRelease(commit: string, quality: string): Promise<void> {
+	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+	const collection = 'dbs/builds/colls/' + quality;
+	const query = {
+		query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
+		parameters: [{ name: '@id', value: commit }]
+	};
+
+	let updateTries = 0;
+
+	function update(): Promise<void> {
+		updateTries++;
+
+		return new Promise<void>((c, e) => {
+			client.queryDocuments(collection, query).toArray((err, results) => {
+				if (err) { return e(err); }
+				if (results.length !== 1) { return e(new Error('No documents')); }
+
+				const release = results[0];
+				release.isReleased = true;
+
+				client.replaceDocument(release._self, release, err => {
+					if (err && err.code === 409 && updateTries < 5) { return c(update()); }
+					if (err) { return e(err); }
+
+					console.log('Build successfully updated.');
+					c();
+				});
+			});
+		});
+	}
+
+	return update();
+}
+
+async function release(commit: string, quality: string): Promise<void> {
+	const config = await getConfig(quality);
+
+	console.log('Quality config:', config);
+
+	if (config.frozen) {
+		console.log(`Skipping release because quality ${quality} is frozen.`);
+		return;
+	}
+
+	await doRelease(commit, quality);
+}
+
+function env(name: string): string {
+	const result = process.env[name];
+
+	if (!result) {
+		throw new Error(`Skipping release due to missing env: ${name}`);
+	}
+
+	return result;
+}
+
+async function main(): Promise<void> {
+	const commit = env('BUILD_SOURCEVERSION');
+	const quality = env('VSCODE_QUALITY');
+
+	await release(commit, quality);
+}
+
+main().catch(err => {
+	console.error(err);
+	process.exit(1);
+});

build/azure-pipelines/common/sync-mooncake.ts

@@ -153,11 +153,6 @@ async function sync(commit: string, quality: string): Promise<void> {
 }
 
 function main(): void {
-	if (process.env['VSCODE_BUILD_SKIP_PUBLISH']) {
-		error('Skipping publish due to VSCODE_BUILD_SKIP_PUBLISH');
-		return;
-	}
-
 	const commit = process.env['BUILD_SOURCEVERSION'];
 
 	if (!commit) {

build/azure-pipelines/product-build.yml

@@ -78,8 +78,22 @@ jobs:
   steps:
   - template: darwin/product-build-darwin.yml
 
+- job: Release
+  condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['Build.Reason'], 'Schedule')), and(eq(variables['VSCODE_QUALITY'], 'exploration'), eq(variables['Build.SourceBranch'], 'refs/heads/electron-4.0.x'))))
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  dependsOn:
+  - Windows
+  - Windows32
+  - Linux
+  - LinuxSnap
+  - LinuxArmhf
+  - LinuxAlpine
+  - macOS
+  steps:
+  - template: release.yml
+
 - job: Mooncake
-  timeoutInMinutes: 120
   pool:
     vmImage: 'Ubuntu-16.04'
   condition: true

build/azure-pipelines/release.yml

+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "10.x"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.x"
+
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'vscode-builds-subscription'
+    KeyVaultName: vscode
+
+- script: |
+    set -e
+
+    (cd build ; yarn)
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    node build/azure-pipelines/common/release.js