Skip to content

Commit dd534cc

Browse files
committed
fix: only delete temp branch in the end
1 parent c382772 commit dd534cc

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/index.js

+6-10
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,20 @@ async function run() {
77

88
const pullRequests = await getPrs()
99

10-
11-
let lastMergeCommitSha
12-
for (let pull of pullRequests) {
13-
try {
10+
try {
11+
let lastMergeCommitSha
12+
for (let pull of pullRequests) {
1413
console.log(`Merging PR ${pull.number}`)
1514
const { data } = await mergeBranchs(pull.head.ref)
1615

1716
console.log(`Successful merge PR ${pull.number}`);
1817

1918
lastMergeCommitSha = data.sha
20-
} finally {
21-
await deleteBranch(workBranchName)
2219
}
20+
await recreateDeployBranch(lastMergeCommitSha)
21+
} finally {
22+
await deleteBranch(workBranchName)
2323
}
24-
25-
await recreateDeployBranch(lastMergeCommitSha)
26-
27-
await deleteBranch(workBranchName)
2824
}
2925

3026
run()

0 commit comments

Comments
 (0)