Skip to content

chore: auto merge vaadin-bot cherry-pick PRs - #13049

Merged
ZheSun88 merged 1 commit into
mainfrom
chore/auto-merge-cherry-picks
Oct 9, 2026
Merged

ZheSun88 merged 1 commit into
mainfrom
chore/auto-merge-cherry-picks

Conversation

@vaadin-bot

Copy link
Copy Markdown
Collaborator

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

🤖 Generated with Claude Code

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 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>
@sonarqubecloud

sonarqubecloud Bot commented Oct 9, 2026

Copy link
Copy Markdown

@ZheSun88
ZheSun88 enabled auto-merge (squash) October 9, 2026 08:37
@ZheSun88
ZheSun88 merged commit b49f24b into main Oct 9, 2026
14 checks passed
@ZheSun88
ZheSun88 deleted the chore/auto-merge-cherry-picks branch October 9, 2026 08:48
@vaadin-bot

Copy link
Copy Markdown
Collaborator Author

This ticket/PR has been released with Vaadin 25.4.0-alpha3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants