ci: switch auto-merge to --auto and resolve AI reviewer threads#39
Merged
ci: switch auto-merge to --auto and resolve AI reviewer threads#39
Conversation
- Replace --admin with --auto to fix race condition where merge fires before CI checks complete - Add step to resolve review threads from Copilot/CodeRabbit before queuing auto-merge, required now that thread resolution is enforced via rulesets Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
📝 WalkthroughWalkthroughThe GitHub Actions workflow for Dependabot auto-merge has been modified to reduce permissions from Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (2)
.github/workflows/dependabot-automerge.yml (2)
57-64: Consider adding basic error handling for thread resolution.The
--silentflag suppresses output, but if a thread resolution fails (e.g., due to permissions or a thread being deleted), the merge will proceed regardless. Depending on your branch protection rules, this could cause the merge to fail later.🛡️ Proposed: Add error logging without failing the workflow
for THREAD_ID in $THREADS; do - gh api graphql -f query=' + if ! gh api graphql -f query=' mutation($id: ID!) { resolveReviewThread(input: {threadId: $id}) { thread { isResolved } } - }' -f id="$THREAD_ID" --silent + }' -f id="$THREAD_ID" --silent; then + echo "::warning::Failed to resolve thread $THREAD_ID" + fi done🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In @.github/workflows/dependabot-automerge.yml around lines 57 - 64, The thread-resolution loop uses the gh api graphql call with --silent and doesn't check its result; update the loop that iterates over THREAD_ID to capture the gh api response and exit status for the resolveReviewThread mutation, log a clear warning including the THREAD_ID and any returned error message when the call fails (e.g., permission denied or thread not found), and continue without exiting non‑zero so the workflow doesn't abort; reference the existing THREAD_ID variable and the resolveReviewThread graphql mutation when implementing the check and log.
45-55: Pagination limit may miss threads in edge cases.The
first: 100limit is likely sufficient for typical Dependabot PRs, but if a PR accumulates more than 100 review threads, some will remain unresolved.♻️ Optional: Add pagination handling
If robustness is desired, consider adding cursor-based pagination or at minimum logging a warning when 100 threads are returned:
- THREADS=$(gh api graphql -f query=' + RESPONSE=$(gh api graphql -f query=' query($owner: String!, $repo: String!, $pr: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $pr) { reviewThreads(first: 100) { nodes { id isResolved } + pageInfo { hasNextPage } } } } - }' -f owner="$REPO_OWNER" -f repo="$REPO_NAME" -F pr="$PR_NUMBER" \ - --jq '.data.repository.pullRequest.reviewThreads.nodes[] | select(.isResolved == false) | .id') + }' -f owner="$REPO_OWNER" -f repo="$REPO_NAME" -F pr="$PR_NUMBER") + + if echo "$RESPONSE" | jq -e '.data.repository.pullRequest.reviewThreads.pageInfo.hasNextPage' | grep -q true; then + echo "::warning::More than 100 review threads exist; some may not be resolved" + fi + + THREADS=$(echo "$RESPONSE" | jq -r '.data.repository.pullRequest.reviewThreads.nodes[] | select(.isResolved == false) | .id')🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In @.github/workflows/dependabot-automerge.yml around lines 45 - 55, The GraphQL query used to populate THREADS uses a fixed page size reviewThreads(first: 100) which can miss threads if a PR has >100 review threads; update the logic that builds THREADS to handle pagination (use reviewThreads with cursors and after, or loop requests until pageInfo.hasNextPage is false) or at minimum detect when exactly 100 nodes are returned and log a warning; adjust the gh api graphql calls that assign THREADS so they iterate with the cursor from pageInfo.endCursor (or re-run queries) until all nodes are fetched, ensuring all unresolved thread ids are collected.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In @.github/workflows/dependabot-automerge.yml:
- Around line 44-67: The current sequence resolves existing review threads
(THREADS / THREAD_ID) then immediately queues the merge with gh pr merge
--squash --auto, which can race with AI reviewers creating new threads; after
the block that resolves THREADS and before calling gh pr merge --squash --auto
"$PR_URL", re-query the same GraphQL reviewThreads query to detect any
newly-unresolved threads and either (a) resolve them in the same loop (repeating
until the query returns none) or (b) fail/exit the workflow so it can be re-run
later; implement a small backoff/sleep between iterations to avoid tight loops
and ensure you reference the existing THREADS/THREAD_ID logic when adding the
retry/check step.
---
Nitpick comments:
In @.github/workflows/dependabot-automerge.yml:
- Around line 57-64: The thread-resolution loop uses the gh api graphql call
with --silent and doesn't check its result; update the loop that iterates over
THREAD_ID to capture the gh api response and exit status for the
resolveReviewThread mutation, log a clear warning including the THREAD_ID and
any returned error message when the call fails (e.g., permission denied or
thread not found), and continue without exiting non‑zero so the workflow doesn't
abort; reference the existing THREAD_ID variable and the resolveReviewThread
graphql mutation when implementing the check and log.
- Around line 45-55: The GraphQL query used to populate THREADS uses a fixed
page size reviewThreads(first: 100) which can miss threads if a PR has >100
review threads; update the logic that builds THREADS to handle pagination (use
reviewThreads with cursors and after, or loop requests until
pageInfo.hasNextPage is false) or at minimum detect when exactly 100 nodes are
returned and log a warning; adjust the gh api graphql calls that assign THREADS
so they iterate with the cursor from pageInfo.endCursor (or re-run queries)
until all nodes are fetched, ensuring all unresolved thread ids are collected.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: dff856f8-da79-4de0-a20c-cd39a4970649
📒 Files selected for processing (1)
.github/workflows/dependabot-automerge.yml
There was a problem hiding this comment.
Pull request overview
Updates the Dependabot auto-merge workflow to avoid merging before required CI checks finish and to satisfy the repo ruleset requirement that review threads be resolved before merging.
Changes:
- Switches from
gh pr merge --admintogh pr merge --autoso merges wait for required checks. - Adds a GraphQL-driven step to resolve review threads before enabling auto-merge.
- Adjusts job-level permissions and refactors the merge step to include PR/repo context env vars.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
gh pr merge --adminwithgh pr merge --autoto fix the race condition where the merge fires before CI checks completepr-qualityruleset enforcesrequired_review_thread_resolutionTest plan
🤖 Generated with Claude Code
Summary by CodeRabbit