Repository navigation
chore: auto merge vaadin-bot cherry-pick PRs - #10382
Merged
Merged
Conversation
Adds an hourly workflow that approves and enables auto merge for open,
non-draft cherry-pick PRs opened by vaadin-bot ("CP:" in the title, not
targeting main, no ai-resolved-conflict label) once every check and
commit status on them has passed. The rules are in autoMerge.js of
vaadin/platform-build-script. The run summary lists each PR checked and
its outcome.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
ZheSun88
enabled auto-merge
October 9, 2026 06:55
ZheSun88
approved these changes
Oct 9, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
Oct 9, 2026
ZheSun88
added a commit
to vaadin/web-components
that referenced
this pull request
Oct 9, 2026
## Description Adds `.github/workflows/auto-merge.yml`, which approves cherry-pick PRs and enables auto merge (squash) on them when they: - are open and not a draft - were opened by `vaadin-bot` - have `CP:` in the title - do not target `main` - have no `ai-resolved-conflict` label - have passed every check on the head commit. Skipped checks, such as `claude` on bot PRs, count as passed. PRs whose checks are still running are retried on the next run. The rules are in `scripts/autoMerge.js` of vaadin/platform-build-script (`AUTO_MERGE_POLICY=cherry-pick`, vaadin/platform-build-script#210). The same workflow is added to flow-components in vaadin/flow-components#10382. The workflow runs hourly, and can be run manually with a `dry-run` option. Scheduled workflows always run from `main`, so this one file covers PRs into every maintenance branch and does not need to be cherry-picked. PRs that already have auto merge enabled or are already approved are skipped. Each run writes a summary table with every PR it checked and the outcome: approved with auto merge enabled, skipped (with the reason), or failed. Secrets (organization level, already available to this repository): `VAADIN_BOT_TOKEN` (reads the PRs, enables auto merge, downloads the script) and `VAADIN_REVIEW_BOT` (approves; must be an account other than `vaadin-bot`). ## Testing - The script rules were tested with a mocked GitHub API in vaadin/platform-build-script#210. - The run step was tested locally with stubbed `gh` and `node` in vaadin/flow-components#10382. This file is identical apart from `actions/checkout@v7`. - Checked the checks on recent `vaadin-bot` cherry-pick PRs here (#12928, #12930, #12997): all are check runs that pass or are skipped, so they would have been approved. - Not run on GitHub yet. After merging, a manual run with `dry-run` checks that the token can download the script and lists the matching PRs without approving anything. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Zhe Sun <zhe@vaadin.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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
Adds
.github/workflows/auto-merge.yml, which approves cherry-pick PRs and enables auto merge (squash) on them when they:vaadin-botCP:in the titlemainai-resolved-conflictlabelThe rules are in
scripts/autoMerge.jsof vaadin/platform-build-script (AUTO_MERGE_POLICY=cherry-pick, vaadin/platform-build-script#210).The workflow runs hourly, and can be run manually with a
dry-runoption. Scheduled workflows always run frommain, so this one file covers PRs into every maintenance branch and does not need to be cherry-picked. PRs that already have auto merge enabled or are already approved are skipped.Each run writes a summary table with every PR it checked and the outcome: approved with auto merge enabled, skipped (with the reason), or failed.
Secrets:
VAADIN_BOT_TOKEN(reads the PRs, enables auto merge, downloads the script) andVAADIN_REVIEW_BOT(approves; must be an account other thanvaadin-bot).Testing
ghandnode: approved, skipped and failed PRs, a title containing|, and dry run.dry-runchecks that the token can download the script and lists the matching PRs without approving anything.🤖 Generated with Claude Code