Better handle of pull request mergeability

This commit is contained in:
lowlighter
2021-03-09 12:19:44 +01:00
parent 5b2d46f1d0
commit 163146cd25

View File

@@ -298,6 +298,7 @@
//Merge pull request //Merge pull request
if (committer.merge) { if (committer.merge) {
info("Merge method", committer.merge) info("Merge method", committer.merge)
let attempts = 720
do { do {
//Check pull request mergeability (https://octokit.github.io/rest.js/v18#pulls-get) //Check pull request mergeability (https://octokit.github.io/rest.js/v18#pulls-get)
const {data:{mergeable, mergeable_state:state}} = await committer.rest.pulls.get({...github.context.repo, pull_number:number}) const {data:{mergeable, mergeable_state:state}} = await committer.rest.pulls.get({...github.context.repo, pull_number:number})
@@ -312,7 +313,7 @@
await committer.rest.pulls.merge({...github.context.repo, pull_number:number, merge_method:committer.merge}) await committer.rest.pulls.merge({...github.context.repo, pull_number:number, merge_method:committer.merge})
info(`Merge #${number} to ${committer.branch}`, "ok") info(`Merge #${number} to ${committer.branch}`, "ok")
break break
} while (true) } while (--attempts)
} }
} }