Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move bing settings to its own stage (#123504)" (#123523)

Browse Source 
This reverts commit 62c9755886.
This commit is contained in:
Tyler James Leonhardt
2021-05-10 16:54:10 -07:00
committed by GitHub
parent ae998a9261
commit 4eef854ab4
4 changed files with 14 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build/gulpfile.vscode.js
View File

@@ -467,12 +467,12 @@ gulp.task('vscode-translations-import', function () {
}));
});
// This task is run in the Bing stage and only picks up the Linux asset
// This task is only run for the MacOS build
const generateVSCodeConfigurationTask = task.define('generate-vscode-configuration', () => {
return new Promise((resolve, reject) => {
const buildDir = process.env['PIPELINE_WORKSPACE'];
const buildDir = process.env['AGENT_BUILDDIRECTORY'];
if (!buildDir) {
return reject(new Error('$PIPELINE_WORKSPACE not set'));
return reject(new Error('$AGENT_BUILDDIRECTORY not set'));
}
if (process.env.VSCODE_QUALITY !== 'insider' && process.env.VSCODE_QUALITY !== 'stable') {
@@ -482,9 +482,9 @@ const generateVSCodeConfigurationTask = task.define('generate-vscode-configurati
const userDataDir = path.join(os.tmpdir(), 'tmpuserdata');
const extensionsDir = path.join(os.tmpdir(), 'tmpextdir');
const arch = process.env['VSCODE_ARCH'];
const appRoot = path.join(buildDir, 'vscode_client_linux_x64_archive-unsigned', `VSCode-linux-${arch}`);
const appName = process.env.VSCODE_QUALITY === 'insider' ? 'code-insiders' : 'code';
const appPath = path.join(appRoot, 'bin', appName);
const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`);
const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', 'code');
const codeProc = cp.exec(
`${appPath} --export-default-configuration='${allConfigDetailsPath}' --wait --user-data-dir='${userDataDir}' --extensions-dir='${extensionsDir}'`,
(err, stdout, stderr) => {