add retry for the mergeability computation

Signed-off-by: TomeHirata <tomu.hirata@gmail.com>
mlflow · Nov 1, 2023 · eccd76c · eccd76c
1 parent 9ca5fc6
commit eccd76c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/auto-merge.js b/.github/workflows/auto-merge.js
@@ -4,6 +4,8 @@ module.exports = async ({ github, context }) => {
   } = context;
 
   const MERGE_INTERVAL_MS = 5000; // 5 seconds pause after a merge
+  const MAX_RETRIES = 3;
+  const RETRY_INTERVAL_MS = 10000; // 10 seconds
 
   async function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -18,16 +20,21 @@ module.exports = async ({ github, context }) => {
   }
 
   async function fetchPullRequestDetails(prNumber) {
-    const pullRequest = await github.rest.pulls
-      .get({
-        owner,
-        repo,
-        pull_number: prNumber,
-      })
-      .then((res) => res.data);
-
-    if (pullRequest.mergeable !== null) {
-      return pullRequest;
+    for (let i = 0; i < MAX_RETRIES; i++) {
+      const pullRequest = await github.rest.pulls
+        .get({
+          owner,
+          repo,
+          pull_number: prNumber,
+        })
+        .then((res) => res.data);
+
+      if (pullRequest.mergeable !== null) {
+        return pullRequest;
+      }
+
+      console.log(`Waiting for mergeability calculation for PR #${prNumber}...`);
+      await sleep(RETRY_INTERVAL_MS);
     }
     return null;
   }

diff --git a/.github/workflows/remove-automerge-label.yml b/.github/workflows/remove-automerge-label.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   remove-label:
     runs-on: ubuntu-latest
-    if: ${{ !contains(fromJSON('["OWNER", "COLLABORATOR"]'), github.event.pull_request.author_association )}}
+    if: ${{ !contains(fromJSON('["OWNER", "COLLABORATOR", "MEMBER"]'), github.event.pull_request.author_association )}}
     steps:
       - uses: actions/checkout@v4
       - name: Remove automerge label