Skip to content

Commit d1efbb1

Browse files
committed
Pin aggregate zip to 108..116
1 parent fab9cec commit d1efbb1

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

make-util.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,10 +832,11 @@ var getRefs = function () {
832832

833833
var release = parseInt(branch.split('/').pop().substr(1));
834834

835-
// filter out releases less than 108 and greater than HEAD
835+
// filter out releases less than 108 and greater than 116 (because releases/dev15tfsu2rc1 branched from releases/m117)
836836
if (release < 108 ||
837-
release > (info.head.release || 999)) {
837+
release > 116) {
838838

839+
console.log(`Skipping ${release} since it falls outside of [108..116].`)
839840
return;
840841
}
841842

make.js

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -446,25 +446,8 @@ target.publish = function() {
446446
return;
447447
}
448448

449-
// get the branch/commit info
450-
var refs = util.getRefs();
451-
452-
// test whether to publish the non-aggregated tasks zip
453-
// skip if not the tip of a release branch
454-
var release = refs.head.release;
455-
var commit = refs.head.commit;
456-
if (!release ||
457-
!refs.releases[release] ||
458-
commit != refs.releases[release].commit) {
459-
460-
// warn not publishing the non-aggregated
461-
console.log(`##vso[task.logissue type=warning]Skipping publish for non-aggregated tasks zip. HEAD is not the tip of a release branch.`);
462-
}
463-
else {
464-
// store the non-aggregated tasks zip
465-
var nonAggregatedZipPath = path.join(packagePath, 'non-aggregated-tasks.zip');
466-
util.storeNonAggregatedZip(nonAggregatedZipPath, release, commit);
467-
}
449+
// warn not publishing the non-aggregated
450+
console.log(`##vso[task.logissue type=warning]Skipping publish for non-aggregated tasks zip.`);
468451

469452
// resolve the nupkg path
470453
var nupkgFile;

0 commit comments

Comments
 (0)