Skip to content

fix(ci): re-trigger auto-merge after review and checks complete [OMN-7786] - #1230

Merged
jonahgabriel merged 1 commit into
mainfrom
jonah/omn-7786-auto-merge-retrigger
Apr 11, 2026
Merged

jonahgabriel merged 1 commit into
mainfrom
jonah/omn-7786-auto-merge-retrigger

Conversation

@jonahgabriel

Copy link
Copy Markdown
Collaborator

Summary

  • Add pull_request_review and check_suite triggers so auto-merge re-attempts after CodeRabbit review and CI completion, closing the race where the workflow fires once at PR open before branch protection gates clear.
  • Resolve PR number and author per event type; gate enablement on PR author login (event.actor reflects the event trigger, not the PR author).
  • Remove silent continue-on-error; tolerate benign "already enqueued"/"clean" races via grep while surfacing real failures.
  • Add workflow_dispatch for manual recovery.

Why

merge-sweep Track A has been re-enabling auto-merge by hand on every PR because the original workflow fired once at PR creation, silently failed when CodeRabbit hadn't reviewed yet, and never re-attempted.

Related: OMN-6571, OMN-5134

Test plan

  • Workflow YAML parses (verified locally)
  • Next PR in this repo gets auto-merge enabled without merge-sweep intervention

…7786]

The auto-merge workflow fired once at PR creation, before CodeRabbit posted
its review. GitHub silently rejected the enable request when branch
protection gates were pending, and continue-on-error hid the failure.
By the time CodeRabbit finished and required_conversation_resolution
cleared, no re-trigger existed, so merge-sweep had to re-enable auto-merge
manually on every PR.

- Add pull_request_review and check_suite triggers so the workflow
  re-attempts after review submission and CI completion
- Add workflow_dispatch for manual recovery
- Resolve PR number and author per event type (pull_request payload,
  check_suite.pull_requests, workflow_dispatch input)
- Remove continue-on-error; tolerate benign "already enqueued" races
  via grep, surface real failures loudly
- Gate on PR author login (pulled from resolved payload) instead of
  github.actor, which reflects the event actor, not the PR author
@coderabbitai

coderabbitai Bot commented Apr 11, 2026

Copy link
Copy Markdown

Warning

Rate limit exceeded

@jonahgabriel has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 9 minutes and 6 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 9 minutes and 6 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 5b6b145f-1738-4e2c-b4b2-63caae717dbc

📥 Commits

Reviewing files that changed from the base of the PR and between 9d3d80c and dabf3c5.

📒 Files selected for processing (1)
  • .github/workflows/auto-merge.yml
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch jonah/omn-7786-auto-merge-retrigger

Comment @coderabbitai help to get the list of available commands and usage tips.

@jonahgabriel
jonahgabriel enabled auto-merge April 11, 2026 08:10
@jonahgabriel
jonahgabriel added this pull request to the merge queue Apr 11, 2026
Merged via the queue into main with commit 40209bd Apr 11, 2026
56 of 57 checks passed
@jonahgabriel
jonahgabriel deleted the jonah/omn-7786-auto-merge-retrigger branch April 11, 2026 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant