Browse Source

build: rebase release branch before reverting bump (#30416)

Co-authored-by: Samuel Attard <[email protected]>
trop[bot] 3 years ago
parent
commit
f5321177e7
1 changed files with 1 additions and 0 deletions
  1. 1 0
      script/release/release-artifact-cleanup.js

+ 1 - 0
script/release/release-artifact-cleanup.js

@@ -26,6 +26,7 @@ function getLastBumpCommit (tag) {
 async function revertBumpCommit (tag) {
   const branch = await getCurrentBranch();
   const commitToRevert = getLastBumpCommit(tag).hash;
+  await GitProcess.exec(['pull', '--rebase']);
   await GitProcess.exec(['revert', commitToRevert], ELECTRON_DIR);
   const pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], ELECTRON_DIR);
   if (pushDetails.exitCode === 0) {