Only return to branch on non closed events

Sauloxd · Sep 2, 2020 · c59800f · c59800f
1 parent 20553a8
commit c59800f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/action/dist/index.js b/packages/action/dist/index.js
@@ -10125,9 +10125,6 @@ async function createReviewApp() {
     });
   }
 
-  core.debug('Return to original state');
-  await exec('git', ['fetch', 'origin', branchName]);
-  await exec('git', ['checkout', branchName]);
 }
 
 
@@ -10294,6 +10291,9 @@ async function otherEvents({
     await exec('git', ['push', 'origin', ghBranch]);
   });
   await io.rmRF('.tmp');
+  core.debug('Return to original state');
+  await exec('git', ['fetch', 'origin', branchName]);
+  await exec('git', ['checkout', branchName]);
 }
 
 

diff --git a/packages/action/src/create-review-app.js b/packages/action/src/create-review-app.js
@@ -57,7 +57,4 @@ async function createReviewApp() {
     });
   }
 
-  core.debug('Return to original state');
-  await exec('git', ['fetch', 'origin', branchName]);
-  await exec('git', ['checkout', branchName]);
 }
diff --git a/packages/action/src/other-events.js b/packages/action/src/other-events.js
@@ -89,4 +89,7 @@ async function otherEvents({
     await exec('git', ['push', 'origin', ghBranch]);
   });
   await io.rmRF('.tmp');
+  core.debug('Return to original state');
+  await exec('git', ['fetch', 'origin', branchName]);
+  await exec('git', ['checkout', branchName]);
 }