Skip to content

Commit ddfe6ef

Browse files
committed
Run cherry-pick asynchronously
1 parent c1ab158 commit ddfe6ef

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/promote_release.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class ReleasePromotion {
111111
cli.warn(`Aborting release promotion for version ${version}`);
112112
return;
113113
}
114-
this.cherryPickToMaster();
114+
await this.cherryPickToMaster();
115115

116116
// There will be cherry-pick conflicts the Releaser will
117117
// need to resolve, so confirm they've been resolved before
@@ -317,7 +317,7 @@ class ReleasePromotion {
317317
await runAsync('./tools/release.sh', ['-i', keyPath]);
318318
}
319319

320-
cherryPickToMaster() {
320+
async cherryPickToMaster() {
321321
// Since we've committed the Working On commit, the release
322322
// commit will be 1 removed from tip-of-tree (e.g HEAD~1).
323323
const releaseCommitSha = this.getCommitSha(1);
@@ -327,7 +327,7 @@ class ReleasePromotion {
327327
runSync('git', ['pull', '--rebase', 'upstream', 'master']);
328328

329329
// There will be conflicts.
330-
runSync('git', ['cherry-pick', releaseCommitSha]);
330+
await runAsync('git', ['cherry-pick', releaseCommitSha]);
331331
}
332332
}
333333

0 commit comments

Comments
 (0)