fix(ci): skip claude-review for bot-authored PRs and serialise the Dependabot merge train#1093
Merged
Merged
Conversation
…pendabot merge train Two changes from the July 2026 Dependabot batch retrospective: - claude-code-review.yml now skips the AI review when the PR author is dependabot[bot] or jim-automation[bot], not just when the actor is. Maintenance pushes to a bot's PR branch (lock-file regeneration, update-with-main) made the human pusher the actor, un-skipping the review on PRs it was designed to skip and burning a doomed review run per push. - review-dependabot skill Step 6 rewritten as a serial merge train: one PR at a time, update and lock-file regeneration in a single push, auto-merge (squash), wait for the merge before touching the next PR. Removes the 'after each merge, comment @dependabot rebase on the remaining PRs' guidance, which cost roughly N-squared/2 CI runs per batch against a floor of N. Adds a merge-from-main fallback for branches with external commits or an unresponsive Dependabot, and hardens the update procedure (verify restore exit status directly, grep for leftover conflict markers before committing). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SmxijKgLk22PXG2benH2i4
JayVDZ
enabled auto-merge (squash)
July 21, 2026 09:19
Contributor
Author
|
@claude Please reply with just the word "verified". This is a credential test for the refreshed CLAUDE_CODE_OAUTH_TOKEN secret. Generated by Claude Code |
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.
Description
Retrospective fixes from the July 2026 Dependabot batch (nine PRs merged over ~24 hours):
claude-code-review.yml: skip the AI review when the PR author isdependabot[bot]orjim-automation[bot], not just when the actor is. Maintenance pushes to a bot's PR branch (lock-file regeneration, update-with-main) make the human pusher the actor, which un-skipped the review on PRs it was designed to skip and burned a doomed review run per push.review-dependabotskill, Step 6: rewritten as a serial merge train; one PR at a time, branch update and lock-file regeneration combined into a single push, auto-merge (squash), wait for merge before touching the next PR. Deletes the "after each merge, comment·@·d·ependabot r·ebaseon the remaining PRs" guidance (roughly N²/2 CI runs per batch of N, against a floor of N). Adds a merge-from-main fallback for branches with external commits or an unresponsive Dependabot, plus update hygiene learned the hard way: verifydotnet restoreexit status as its own command, and grep for leftover conflict markers before committing.Type of change
Testing
Documentation
Docs: n/a - CI workflow and internal skill tooling; no user-facing behaviour change
Screenshots / output (if applicable)
n/a
Checklist
docs/DEVELOPER_GUIDE.mdAdditional context
The
claude-reviewcheck is currently removed from the ruleset's required checks (itsCLAUDE_CODE_OAUTH_TOKENis dead); once the token is refreshed and the check re-added, this change ensures Dependabot PRs satisfy it via the skip path regardless of who pushes to them.🤖 Generated with Claude Code
https://claude.ai/code/session_01SmxijKgLk22PXG2benH2i4
Generated by Claude Code