From f5d592ea5e985ad25856758827412bfba76595fa Mon Sep 17 00:00:00 2001 From: Nessar Date: Mon, 19 Oct 2026 14:45:16 +0200 Subject: [PATCH] chore(deps): automerge minor, patch, digest and pin Renovate updates Renovate merges these updates with a merge commit once the required check passes, three days after their release. Major updates stay manual. The develop merge allowlist admits the renovate bot for this. Co-Authored-By: Claude Opus 5.5 --- AGENTS.md | 2 +- README.md | 2 +- renovate.json | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 47c0c0f..d1c5787 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -16,7 +16,7 @@ This is a single-context repo using root `CONTEXT.md` and `docs/adr/`. See `docs - `develop` is the default integration branch; `main` contains releases. Start `feature/*` branches from the current `origin/develop` and target their PRs to `develop`. - Rebase working branches onto the latest `origin/develop` before opening or merging a PR. If `develop` advances, rebase and rerun the PR checks before merging. -- Integrate through PRs with successful required checks and merges restricted to designated maintainers through Gitea's merge allowlist. Use merge commits (`--no-ff`) with squashing disabled. Direct and forced pushes to `main` and `develop` are forbidden. +- Integrate through PRs with successful required checks and merges restricted to designated maintainers through Gitea's merge allowlist. The `develop` allowlist also admits the `renovate` bot, which automerges minor, patch, digest, and pin updates once `required` passes; major updates stay manual. Use merge commits (`--no-ff`) with squashing disabled. Direct and forced pushes to `main` and `develop` are forbidden. - Use Conventional Commits for new commits and PR titles. - Create `release/X.Y.Z` from `develop` and `hotfix/X.Y.Z` from `main`. Only `release/*` and `hotfix/*` PRs target `main`. Merge each release or hotfix into both `main` and `develop`, keeping its branch until both PRs are merged. - Use merges and back-merges for releases and hotfixes. Never rebase `main`, `develop`, or a frozen release branch. diff --git a/README.md b/README.md index 939964c..bd8a97a 100644 --- a/README.md +++ b/README.md @@ -286,7 +286,7 @@ git push origin v1.6.0 The tag must match the tagged commit's `package.json` version, use stable `vMAJOR.MINOR.PATCH` syntax, and point to a commit reachable from `main`. Wait for the main checks and image publication before tagging: promotion requires its `sha-` image. Tags do not increment the version automatically. -The Gitea repository policy requires `develop` as the default branch and **Merge commit** as the merge method, with squash and rebase merge methods disabled. Configure [branch protection](https://docs.gitea.com/usage/access-control/protected-branches/) for `main` and `develop` to disable direct and forced pushes, restrict the merge allowlist to designated maintainers, require successful status checks, and block outdated PRs. Administrators must follow the protection rules. After merge-message approval and a successful reviewed PR run, replace the migration gate with the reported pull-request context for the `required` job, as described in the activation guide. These are required settings; the migration does not establish that every setting has already been applied. +The Gitea repository policy requires `develop` as the default branch and **Merge commit** as the merge method, with squash and rebase merge methods disabled. Configure [branch protection](https://docs.gitea.com/usage/access-control/protected-branches/) for `main` and `develop` to disable direct and forced pushes, restrict the merge allowlist to designated maintainers, require successful status checks, and block outdated PRs. Administrators must follow the protection rules. The `develop` allowlist also admits the `renovate` bot: [renovate.json](renovate.json) automerges minor, patch, digest, and pin updates three days after their release once the `required` check passes, and leaves major updates for manual review. After merge-message approval and a successful reviewed PR run, replace the migration gate with the reported pull-request context for the `required` job, as described in the activation guide. These are required settings; the migration does not establish that every setting has already been applied. Only `release/*` and `hotfix/*` PRs may target `main`; working PRs target `develop`. CI validates these rules and checks working-branch rebases against the fetched integration head. If `develop` advances after validation, rebase and rerun the PR checks before merging. diff --git a/renovate.json b/renovate.json index 18d1bf2..012114a 100644 --- a/renovate.json +++ b/renovate.json @@ -4,5 +4,18 @@ "config:recommended" ], "prConcurrentLimit": 3, - "automerge": false + "automerge": false, + "automergeStrategy": "merge-commit", + "minimumReleaseAge": "3 days", + "packageRules": [ + { + "matchUpdateTypes": [ + "minor", + "patch", + "digest", + "pin" + ], + "automerge": true + } + ] }