fix: only delete temp branch in the end

stone-ton · Jan 13, 2023 · dd534cc · dd534cc
1 parent c382772
commit dd534cc
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/index.js b/src/index.js
@@ -7,24 +7,20 @@ async function run() {
 
     const pullRequests = await getPrs()
 
-
-    let lastMergeCommitSha
-    for (let pull of pullRequests) {
-        try {
+    try {
+        let lastMergeCommitSha
+        for (let pull of pullRequests) {
             console.log(`Merging PR ${pull.number}`)
             const { data } = await mergeBranchs(pull.head.ref)
 
             console.log(`Successful merge PR ${pull.number}`);
 
             lastMergeCommitSha = data.sha
-        } finally {
-            await deleteBranch(workBranchName)
         }
+        await recreateDeployBranch(lastMergeCommitSha)
+    } finally {
+        await deleteBranch(workBranchName)
     }
-
-    await recreateDeployBranch(lastMergeCommitSha)
-
-    await deleteBranch(workBranchName)
 }
 
 run()