From dd534cc827673d381ea5669177027d5637b5bbde Mon Sep 17 00:00:00 2001 From: Erick Massa Sprengel Date: Fri, 13 Jan 2023 19:24:59 -0300 Subject: [PATCH] fix: only delete temp branch in the end --- src/index.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/index.js b/src/index.js index 85cb727..51d1b3d 100644 --- 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()