Merge branch 'main' into mintlify/f5da8d82

Author: prrao87

.github/workflows/sync-openapi.yml

@@ -44,10 +44,20 @@ jobs:
           branch: "chore/sync-openapi"
           delete-branch: true
 
-      - name: Enable auto-merge (when checks pass)
+      - name: Wait for checks and merge
         if: steps.cpr.outputs.pull-request-number != ''
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          token: ${{ secrets.DOCS_BOT_TOKEN }}
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: squash
+        env:
+          GH_TOKEN: ${{ secrets.DOCS_BOT_TOKEN }}
+        run: |
+          set -euo pipefail
+          pr="${{ steps.cpr.outputs.pull-request-number }}"
+          # Give the pull_request workflow a moment to register checks before watching.
+          for i in $(seq 1 10); do
+            if gh pr checks "$pr" -R "$GITHUB_REPOSITORY" >/dev/null 2>&1; then break; fi
+            sleep 15
+          done
+          gh pr checks "$pr" -R "$GITHUB_REPOSITORY" --watch --fail-fast --interval 30
+          # --admin bypasses the "require status check" base-branch policy on the
+          # immediate merge. Safe here: checks are already confirmed green above, and
+          # the bot token (admin) only ever merges this one bot-generated sync PR.
+          gh pr merge "$pr" -R "$GITHUB_REPOSITORY" --squash --delete-branch --admin

.gitignore

@@ -24,3 +24,4 @@ workflows/docs-audit/artifacts/**
 !workflows/docs-audit/artifacts/
 workflows/docs-audit/state/**
 !workflows/docs-audit/state/
+scratch