fix pr merge bot logic

Author: ananya-dot

.github/workflows/pr-merge.yml

@@ -1,49 +1,51 @@
-name: PR Merge Validator Bot
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-permissions: 
-  contents: read
-  pull-requests: write
-
-jobs:
-  validate-pr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check PR for merge readiness
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const pr = context.payload.pull_request;
-            const mergeable = pr.mergeable;
-
-            if (mergeable === null) {
-              throw new Error('Mergeability status is unknown. Please resolve merge conflicts.');
-            }
-
-            if (mergeable === false) {
-              throw new Error('PR has merge conflicts. Please resolve them before merging.');
-            }
-
-            // Optionally, check for required checks or CI status here
-            const status = await github.rest.checks.listForRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: pr.head.sha
-            });
-
-            const allChecksPassed = status.data.every(check => check.conclusion === 'success');
-            if (!allChecksPassed) {
-              throw new Error('Not all checks have passed. Please ensure all tests are successful.');
-            }
-
-            // Success message with an emoji
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: pr.number,
-              body: '✅ All checks passed! This PR is ready to be merged! 🎉'
-            });
+- name: Check PR for merge readiness
+  uses: actions/github-script@v7
+  with:
+    github-token: ${{ secrets.GITHUB_TOKEN }}
+    script: |
+      const checkMergeability = async () => {
+        let retries = 5;
+        while (retries > 0) {
+          const pr = await github.rest.pulls.get({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            pull_number: context.payload.pull_request.number,
+          });
+          const mergeable = pr.data.mergeable;
+
+          if (mergeable === null) {
+            console.log('Mergeability status is unknown. Retrying...');
+            await new Promise(resolve => setTimeout(resolve, 5000)); // Wait 5 seconds
+            retries--;
+            continue;
+          }
+
+          if (mergeable === false) {
+            throw new Error('PR has merge conflicts. Please resolve them before merging.');
+          }
+
+          return true; // Mergeable
+        }
+        throw new Error('Mergeability status could not be determined after multiple retries.');
+      };
+
+      await checkMergeability();
+
+      const status = await github.rest.checks.listForRef({
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        ref: context.payload.pull_request.head.sha,
+      });
+
+      const allChecksPassed = status.data.check_runs.every(check => check.conclusion === 'success');
+      if (!allChecksPassed) {
+        throw new Error('Not all checks have passed. Please ensure all tests are successful.');
+      }
+
+      // Success message with an emoji
+      await github.rest.issues.createComment({
+        owner: context.repo.owner,
+        repo: context.repo.repo,
+        issue_number: context.payload.pull_request.number,
+        body: '✅ All checks passed! This PR is ready to be merged! 🎉'
+      });

.github/workflows/welcome.yml

@@ -9,6 +9,7 @@ on:
 permissions: 
   contents: read
   issues: write
+  pull-requests: write
 
 
 jobs: