Better handle of pull request mergeability

2021-03-09 12:19:44 +01:00
parent 5b2d46f1d0
commit 163146cd25
1 changed files with 2 additions and 1 deletions
--- a/source/app/action/index.mjs
+++ b/source/app/action/index.mjs
@@ -298,6 +298,7 @@
            //Merge pull request
              if (committer.merge) {
                info("Merge method", committer.merge)
+                let attempts = 720
                do {
                  //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})
@@ -312,7 +313,7 @@
                    await committer.rest.pulls.merge({...github.context.repo, pull_number:number, merge_method:committer.merge})
                    info(`Merge #${number} to ${committer.branch}`, "ok")
                    break
-                } while (true)
+                } while (--attempts)
              }
          }