ci: merge queue support + 7-day Dependabot auto-merge soak#53
Merged
Conversation
- Add merge_group trigger to ci.yml and codeql.yml so CI runs on merge queue branches (required for queue to function) - Remove immediate auto-merge from dependabot-compat.yml; keep approve only - Add dependabot-automerge.yml: scheduled daily job that enables auto-merge on Dependabot PRs that are >= 7 days old, approved, and not yet queued - Major version updates still require manual review
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
1 participant
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
merge_group:trigger toci.ymlandcodeql.yml— required for CI to run on merge queue branches (without this, every queued PR times out after 60 min and fails)dependabot-compat.ymlwith approve-only — the 7-day wait is now enforced separatelydependabot-automerge.yml: scheduled daily at 09:00 UTC, enables auto-merge on Dependabot PRs that are ≥ 7 days old, approved, and not already queued; major version updates are still skipped for manual reviewHow it works end-to-end
dependabot-compat.ymlapproves it (patch/minor only)gh pr merge --auto --squash→ PR enters the merge queueTest plan
merge_groupCI trigger worksdependabot-automerge.ymlmanually (workflow_dispatch) to verify the 7-day logic against the existing open PRs (chore(ci): bump actions/configure-pages from 5 to 6 #46, chore(ci): bump actions/deploy-pages from 4 to 5 #47, chore(ci): bump dorny/paths-filter from 3 to 4 #48, chore(ci): bump codecov/codecov-action from 5 to 6 #50, chore(ci): bump actions/setup-java from 4 to 5 #52 — all > 7 days old)