julien/apf_portal
1
0
Fork 0
Code Issues 1 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore(ci): auto-merge low-risk renovate updates #77

Merged
julien merged 1 commits from chore/ci/renovate-automerge-patches into main 2026-05-10 03:58:02 +02:00
Conversation 0 Commits 1 Files Changed 2
+10 -2
julien commented 2026-05-10 03:57:52 +02:00
Owner
Copy Link
Copy Source

Summary

After ~10 days of clean Renovate track record (~30 PRs merged without regression beyond the TS/ESLint/webpack-cli majors that the dashboard-approval rule now catches), enable auto-merge on the lowest-risk update types. CI is the gate — check / scan / a11y going red leaves the PR open for manual triage.

Update type Pre-PR Post-PR
patch manual review auto-merge if CI green
pin (rolling-tag → fixed-version pin) manual auto-merge if CI green
digest (image digest pin refresh) manual auto-merge if CI green
lockFileMaintenance (weekly transitive refresh) manual auto-merge if CI green
minor manual review (unchanged) manual review
major dashboard approval (unchanged) dashboard approval

automergeStrategy: "squash" matches our trunk-based squash-merge convention. automergeType: "pr" keeps the PR + CI run as the audit trail (vs branch-direct push), and Gitea auto-merges the PR once green via the bot's existing repo:write permission.

Doc updates

  • renovate.json dependencyDashboardHeader — the "Open" row now reflects the new reality: mostly minors, with red patches surfacing briefly when CI fails.
  • docs/development.md §"Reviewing Renovate PRs" gains a bullet describing the auto-merge for contributors landing on the project later.

Test plan

  • CI green on this PR.
  • After merge, the next patch-level Renovate run produces a PR that auto-squashes into main once CI clears (visible in the merged log; no human action required).
  • A patch with red CI stays open in "Open" with the dependencies label.
  • Minor / major Renovate PRs continue to require human merge.
## Summary After ~10 days of clean Renovate track record (~30 PRs merged without regression beyond the TS/ESLint/webpack-cli majors that the dashboard-approval rule now catches), enable auto-merge on the lowest-risk update types. CI is the gate — `check` / `scan` / `a11y` going red leaves the PR open for manual triage. | Update type | Pre-PR | Post-PR | | - | - | - | | **patch** | manual review | **auto-merge if CI green** | | **pin** (rolling-tag → fixed-version pin) | manual | **auto-merge if CI green** | | **digest** (image digest pin refresh) | manual | **auto-merge if CI green** | | **lockFileMaintenance** (weekly transitive refresh) | manual | **auto-merge if CI green** | | **minor** | manual review (unchanged) | manual review | | **major** | dashboard approval (unchanged) | dashboard approval | `automergeStrategy: "squash"` matches our trunk-based squash-merge convention. `automergeType: "pr"` keeps the PR + CI run as the audit trail (vs branch-direct push), and Gitea auto-merges the PR once green via the bot's existing `repo:write` permission. ## Doc updates - `renovate.json` `dependencyDashboardHeader` — the "Open" row now reflects the new reality: mostly minors, with red patches surfacing briefly when CI fails. - `docs/development.md` §"Reviewing Renovate PRs" gains a bullet describing the auto-merge for contributors landing on the project later. ## Test plan - [ ] CI green on this PR. - [ ] After merge, the next patch-level Renovate run produces a PR that auto-squashes into `main` once CI clears (visible in the merged log; no human action required). - [ ] A patch with red CI stays open in "Open" with the `dependencies` label. - [ ] Minor / major Renovate PRs continue to require human merge.
julien added 1 commit 2026-05-10 03:57:52 +02:00
chore(ci): auto-merge low-risk renovate updates
CI / commits (pull_request) Successful in 1m13s
Details
CI / scan (pull_request) Successful in 1m21s
Details
CI / check (pull_request) Successful in 1m22s
Details
CI / a11y (pull_request) Successful in 1m28s
Details
CI / perf (pull_request) Successful in 2m55s
Details
a800b9d28d 
After ~10 days of clean track record on Renovate (~30 PRs merged
without regression beyond the TS/ESLint/webpack-cli majors that
the dashboard-approval rule now catches), enable auto-merge for
patch / pin / digest / lockFileMaintenance updates. CI is the
gate — `check` / `scan` / `a11y` going red leaves the PR open for
manual triage. Minors keep needing human review (might widen
surface), majors are still dashboard-approval-gated.

The dashboard triage header is updated so the "Open" row reflects
the new reality (mostly minors, with red patches surfacing
briefly when CI fails). docs/development.md "Reviewing Renovate
PRs" gains a bullet describing the auto-merge behaviour for
contributors landing on the project later.

`automergeStrategy: "squash"` matches our trunk-based squash-merge
convention. `automergeType: "pr"` keeps a PR + CI run as the
audit trail (vs branch-direct push), and Gitea automerges the PR
once green via the bot's existing `repo:write` permission.
julien merged commit 922a44bb50 into main 2026-05-10 03:58:02 +02:00
julien deleted branch chore/ci/renovate-automerge-patches 2026-05-10 03:58:03 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adastra-bot (AdAstra Bot) julien (Julien Gautier)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: julien/apf_portal#77
Delete Branch "chore/ci/renovate-automerge-patches"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?