From dbbd0de86095db22f89e52bb0279f086fecf4622 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Tue, 3 Jun 2025 08:52:21 +0200 Subject: [PATCH] chore(renovate): bump to v40.40.0 and disable v7 (#8050) - bump renovate to v40.40.0 - remove v7 branch from renovate - disable transitive updates on stable branches (security updates will /should still open automatically) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8050 Reviewed-by: Earl Warren Co-authored-by: Michael Kriese Co-committed-by: Michael Kriese --- .forgejo/workflows/renovate.yml | 2 +- Makefile | 2 +- renovate.json | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml index 1765f58a4e..cddda0fa09 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -28,7 +28,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/renovate/renovate:40.31.0 + image: data.forgejo.org/renovate/renovate:40.40.0 steps: - name: Load renovate repo cache diff --git a/Makefile b/Makefile index c525b8acf8..e70ff166c2 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasour DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.32.0 # renovate: datasource=go GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.5.1 # renovate: datasource=go GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.18.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@40.31.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@40.40.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... diff --git a/renovate.json b/renovate.json index 44a5032c17..03e47cb6a3 100644 --- a/renovate.json +++ b/renovate.json @@ -8,7 +8,6 @@ ], "baseBranches": [ "$default", - "/^v7\\.\\d+/forgejo$/", "/^v11\\.\\d+/forgejo$/" ], "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths", "npmDedupe"], @@ -146,10 +145,10 @@ "minimumReleaseAge": "30 days" }, { - "description": "Disable indirect major for stable branches", + "description": "Disable indirect updates for stable branches", "matchBaseBranches": ["/^v\\d+\\.\\d+\\/forgejo$/"], "matchManagers": ["gomod"], - "matchUpdateTypes": ["major"], + "matchUpdateTypes": ["major", "minor", "patch"], "matchDepTypes": ["indirect"], "enabled": false },