From 163146cd25a637efc0aee46830a4843b8196c3dd Mon Sep 17 00:00:00 2001
From: lowlighter <22963968+lowlighter@users.noreply.github.com>
Date: Tue, 9 Mar 2021 12:19:44 +0100
Subject: [PATCH] Better handle of pull request mergeability

---
 source/app/action/index.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/app/action/index.mjs b/source/app/action/index.mjs
index 2216182d..e9f08818 100644
--- 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)
               }
           }