Skip to content

chore(renovate): enable platform auto-merge for green PRs#111

Merged
ChipWolf merged 2 commits into
mainfrom
chore/renovate-platform-automerge
Jun 16, 2026
Merged

chore(renovate): enable platform auto-merge for green PRs#111
ChipWolf merged 2 commits into
mainfrom
chore/renovate-platform-automerge

Conversation

@ChipWolf

Copy link
Copy Markdown
Owner

What

Make Renovate auto-merge actually fire for green PRs, and document the lesson.

Auto-merge was declared in renovate.json5 but stopped working when commit 003cab3 (2026-05-19) added the Friday-only schedule: that window gates Renovate's own merge step, so green PRs sat unmerged for up to a week (e.g. #104). The repo also lacked the prerequisites for GitHub-native auto-merge.

Changes

  • .github/renovate.json5 — make platformAutomerge: true explicit and document why it depends on the repo-level prerequisites. Hands merging to GitHub's native auto-merge so green PRs merge the moment required checks pass, on any day, decoupled from schedule.
  • home/dot_agents/AGENTS.md — capture the reusable lesson (Renovate auto-merge needs platform prerequisites, not just automerge: true) under "Git and commits".

Repo-level changes already applied live (not in this diff)

  • Repo setting "Allow auto-merge" enabled.
  • Branch protection on main: require MegaLinter, source-tests (ubuntu-24.04), source-tests (windows-2025); strict=false (so the Friday rebase window can't deadlock merges); admins exempt (direct pushes unaffected); no required reviews.

Verification

Enabled auto-merge on a failing PR (#108): GitHub accepted the request but held it (BLOCKED) because MegaLinter was red, confirming auto-merge works and broken PRs stay blocked.

🤖 Generated with Claude Code

ChipWolf and others added 2 commits June 15, 2026 21:10
The Friday-only `schedule` gates Renovate's own merge step, so green PRs
sat unmerged for up to a week. Hand merging to GitHub's native auto-merge
instead: Renovate flags each PR during the Friday window and GitHub merges
it the moment required checks pass, on any day, decoupled from `schedule`.

`platformAutomerge` defaults to true; making it explicit documents the
dependency on the repo-level prerequisites configured alongside this:

- repo setting "Allow auto-merge" enabled
- branch protection on `main` requiring the CI checks (MegaLinter,
  source-tests ubuntu+windows), non-strict, admins exempt

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Captures the lesson from wiring up auto-merge: a restrictive Renovate
`schedule` gates Renovate's own merge step, so platform (GitHub-native)
auto-merge is needed to merge green PRs outside the window, which in turn
needs the repo "Allow auto-merge" setting plus branch protection with the
CI checks required (non-strict, admins exempt).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@ChipWolf ChipWolf enabled auto-merge (squash) June 16, 2026 15:30
@ChipWolf ChipWolf merged commit edbbe96 into main Jun 16, 2026
13 checks passed
@ChipWolf ChipWolf deleted the chore/renovate-platform-automerge branch June 16, 2026 15:35
@github-actions github-actions Bot mentioned this pull request Jun 15, 2026
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