skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(dev-infra): wait for changelog to cherry pick to next branch (#40605)

Browse Source 
Wait for the cherry-picked changelog to be merged into the next
branch before completing the task.

PR Close #40605
This commit is contained in:
Joey Perrott
2021-01-27 13:30:04 -08:00
committed by Misko Hevery
parent 9746751603
commit dceede4f80
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-infra/ng-dev.js
+3 -1
View File
@@ -5885,11 +5885,13 @@ class ReleaseAction {
return false;
}
// Create a cherry-pick pull request that should be merged by the caretaker.
const { url } = yield this.pushChangesToForkAndCreatePullRequest(nextBranch, `changelog-cherry-pick-${newVersion}`, commitMessage, `Cherry-picks the changelog from the "${stagingBranch}" branch to the next ` +
const { url, id } = yield this.pushChangesToForkAndCreatePullRequest(nextBranch, `changelog-cherry-pick-${newVersion}`, commitMessage, `Cherry-picks the changelog from the "${stagingBranch}" branch to the next ` +
`branch (${nextBranch}).`);
info(green(` ✓ Pull request for cherry-picking the changelog into "${nextBranch}" ` +
'has been created.'));
info(yellow(` Please ask team members to review: ${url}.`));
// Wait for the Pull Request to be merged.
yield this.waitForPullRequestToBeMerged(id);
return true;
});
}