@@ -373,8 +373,8 @@ export default class ReleasePromotion extends Session {
373
373
let prompt = 'Merge proposal branch into staging branch?' ;
374
374
if ( dryRun ) {
375
375
cli . info ( 'Run the following commands to merge the staging branch:' ) ;
376
- cli . info ( `git push ${ this . upstream } HEAD:refs/heads/${ releaseBranch } ` ) ;
377
- cli . info ( `git push ${ this . upstream } HEAD:refs/heads/${ stagingBranch } `) ;
376
+ cli . info ( `git push ${ this . upstream } HEAD:refs/heads/${ releaseBranch
377
+ } HEAD:refs/heads/${ stagingBranch } `) ;
378
378
prompt = 'Ready to continue?' ;
379
379
}
380
380
@@ -388,12 +388,9 @@ export default class ReleasePromotion extends Session {
388
388
389
389
// TODO: find a solution for key passphrase from the terminal
390
390
cli . startSpinner ( 'Merging proposal branch' ) ;
391
- await Promise . all ( [
392
- forceRunAsync ( 'git' , [ 'push' , this . upstream , `HEAD:refs/heads/${ releaseBranch } ` ] ,
393
- { ignoreFailure : false } ) ,
394
- forceRunAsync ( 'git' , [ 'push' , this . upstream , `HEAD:refs/heads/${ stagingBranch } ` ] ,
395
- { ignoreFailure : false } )
396
- ] ) ;
391
+ await forceRunAsync ( 'git' , [ 'push' , this . upstream , `HEAD:refs/heads/${ releaseBranch } ` ,
392
+ `HEAD:refs/heads/${ stagingBranch } ` ] ,
393
+ { ignoreFailure : false } ) ;
397
394
cli . stopSpinner ( 'Merged proposal branch' ) ;
398
395
}
399
396
@@ -404,8 +401,7 @@ export default class ReleasePromotion extends Session {
404
401
let prompt = `Push release tag and ${ this . branch } to ${ this . upstream } ?` ;
405
402
if ( dryRun ) {
406
403
cli . info ( 'Run the following commands to push to remote:' ) ;
407
- cli . info ( `git push ${ this . upstream } ${ this . branch } ` ) ;
408
- cli . info ( `git push ${ this . upstream } ${ tagVersion } ` ) ;
404
+ cli . info ( `git push ${ this . upstream } ${ this . branch } ${ tagVersion } ` ) ;
409
405
prompt = 'Ready to continue?' ;
410
406
}
411
407
@@ -418,10 +414,8 @@ export default class ReleasePromotion extends Session {
418
414
}
419
415
420
416
cli . startSpinner ( 'Pushing to remote' ) ;
421
- await Promise . all ( [
422
- forceRunAsync ( 'git' , [ 'push' , this . upstream , this . branch ] , { ignoreFailure : false } ) ,
423
- forceRunAsync ( 'git' , [ 'push' , this . upstream , tagVersion ] , { ignoreFailure : false } )
424
- ] ) ;
417
+ await forceRunAsync ( 'git' , [ 'push' , this . upstream , this . branch , tagVersion ] ,
418
+ { ignoreFailure : false } ) ;
425
419
cli . stopSpinner ( `Pushed ${ tagVersion } and ${ this . branch } to remote` ) ;
426
420
}
427
421
0 commit comments