Skip to content

ci: auto-merge Dependabot patch and minor PRs - #211

Merged
siracusa5 merged 2 commits into
mainfrom
chore/dependabot-auto-merge
Oct 28, 2026
Merged

siracusa5 merged 2 commits into
mainfrom
chore/dependabot-auto-merge

Conversation

@siracusa5

@siracusa5 siracusa5 commented Oct 28, 2026 •

Copy link
Copy Markdown
Collaborator

What

A workflow that queues GitHub's native auto-merge (gh pr merge --auto --squash) for Dependabot PRs that are patch or minor updates. Major updates get the needs-manual-review label and wait for a human.

Settings changed outside this PR

  • New ruleset main: require CI: the required check must pass before anything lands on main. Org admins can bypass. The existing protect main ruleset is untouched.
  • Repo setting "Allow auto-merge" is on.
  • New label needs-manual-review.

The required job aggregates engine, engine-windows, console, site, desktop and desktop-linux, and it passed on Dependabot PR #206. A Dependabot PR that fails CI stays open.

Things to know

  • The workflow checks the PR author (pull_request.user.login), not github.actor, which can be spoofed by commenting on a fork PR. It uses pull_request, not pull_request_target, and pins dependabot/fetch-metadata to a commit SHA.
  • An auto-merge does not start push workflows. Merges made with GITHUB_TOKEN run no push-triggered workflows (in harness-kit, 12 bot merges ran 0 and 2 human merges ran 3 each). So site-deploy.yml, console-preview.yml and the push run of ci.yml skip these merges, and a bump reaches production with the next push to main that touches the same app. The desktop app only releases from a tag either way.
  • The DCO check exempts verified bot commits, so Dependabot PRs still pass sign-off.
  • Pairs with chore(deps): merge npm Dependabot entries and add cooldown #209, which groups the npm updates and adds a 7-day cooldown. Either can merge first.

Test plan

  • Workflow YAML parses; the deploy and release triggers above were read from the workflow files
  • Same workflow shape has run on grouped Dependabot PRs in harness-kit (#428, #432, #433, #436)
  • After merge, the next Dependabot patch or minor PR gets auto-merge enabled and merges once required is green
  • After merge, the next major PR gets the label and stays open

🤖 Generated with Claude Code

siracusa5 and others added 2 commits October 28, 2026 02:07
Queues native auto-merge for Dependabot patch and minor updates. The
"main: require CI" ruleset holds the merge until the `required` check
passes. Majors get the needs-manual-review label.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: John Siracusa <siracusa5@users.noreply.github.com>
Merges made with GITHUB_TOKEN do not start push-triggered workflows, so
auto-merged bumps skip the deploy and push CI runs. The earlier comment
said the opposite.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Signed-off-by: John Siracusa <siracusa5@users.noreply.github.com>
@siracusa5
siracusa5 merged commit 47d260c into main Oct 28, 2026
12 checks passed
@siracusa5
siracusa5 deleted the chore/dependabot-auto-merge branch October 28, 2026 07:20
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