chore(deps): automerge minor, patch, digest and pin Renovate updates
CI / policy (pull_request) Successful in 13s
CI / validate (pull_request) Successful in 33s
CI / build (pull_request) Successful in 31s
CI / benchmark (pull_request) Successful in 1m17s
CI / security (pull_request) Successful in 58s
CI / test (pull_request) Successful in 1m54s
CI / images (pull_request) Successful in 1m13s
CI / required (pull_request) Successful in 1s
CI / policy (push) Successful in 7s
CI / validate (push) Successful in 27s
CI / build (push) Successful in 36s
CI / benchmark (push) Successful in 1m23s
CI / security (push) Successful in 59s
CI / test (push) Successful in 1m57s
CI / images (push) Successful in 52s
CI / required (push) Successful in 1s
CI / policy (pull_request) Successful in 13s
CI / validate (pull_request) Successful in 33s
CI / build (pull_request) Successful in 31s
CI / benchmark (pull_request) Successful in 1m17s
CI / security (pull_request) Successful in 58s
CI / test (pull_request) Successful in 1m54s
CI / images (pull_request) Successful in 1m13s
CI / required (pull_request) Successful in 1s
CI / policy (push) Successful in 7s
CI / validate (push) Successful in 27s
CI / build (push) Successful in 36s
CI / benchmark (push) Successful in 1m23s
CI / security (push) Successful in 59s
CI / test (push) Successful in 1m57s
CI / images (push) Successful in 52s
CI / required (push) Successful in 1s
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 <noreply@anthropic.com>
This commit was merged in pull request #313.
This commit is contained in:
1 parent
9e5c93e733
commit
f5d592ea5e
3 files changed
+16
-3
No files matched your search
@@ -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.
|
||||
|
||||
Reference in new issue
Block a user