Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #53445 - only run getSettingsSearchBuildId on official builds

Browse Source
This commit is contained in:
Rob Lourens
2018-07-02 09:58:40 -07:00
parent 8077d80adb
commit d028c09232
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/gulpfile.vscode.js
View File

@@ -268,10 +268,8 @@ function packageTask(platform, arch, opts) {
const date = new Date().toISOString();
const productJsonUpdate = { commit, date, checksums };
try {
if (shouldSetupSettingsSearch()) {
productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
} catch (err) {
console.warn(err);
}
const productJsonStream = gulp.src(['product.json'], { base: '.' })
@@ -470,9 +468,9 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
const branch = process.env.BUILD_SOURCEBRANCH;
if (!/\/master$/.test(branch) && branch.indexOf('/release/') < 0) {
if (!shouldSetupSettingsSearch()) {
const branch = process.env.BUILD_SOURCEBRANCH;
console.log(`Only runs on master and release branches, not ${branch}`);
return;
}
@@ -495,6 +493,11 @@ gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () =
}));
});
function shouldSetupSettingsSearch() {
const branch = process.env.BUILD_SOURCEBRANCH;
return typeof branch === 'string' && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
}
function getSettingsSearchBuildId(packageJson) {
const previous = util.getPreviousVersion(packageJson.version);