From 15316bfbd52401061a470892e1be917112f9b518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= <mail@jkroepke.de>
Date: Fri, 16 Oct 2026 18:17:08 +0200
Subject: [PATCH] chore: Refactor renovate.json package rules and labels
 (#2762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
---
 renovate.json | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/renovate.json b/renovate.json
index 186f861a..b893f770 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,15 +14,6 @@
   "baseBranchPatterns": ["main","/^[0-9]\\.[0-9][0-9]$/"],
   "ignorePaths": ["**/workflows/container_description.yml","**/workflows/stale.yml","**/workflows/govulncheck.yml"],
   "packageRules": [
-    {
-      "groupName": "golangci-lint",
-      "matchPackageNames": [
-        "github.com/golangci/golangci-lint/cmd/golangci-lint",
-        "golangci/golangci-lint",
-        "golangci/golangci-lint-action"
-      ],
-      "addLabels": ["chore"]
-    },
     {
       "matchPackageNames": ["gopkg.in/yaml"],
       "enabled": false
@@ -39,7 +30,16 @@
       "matchDatasources": ["!/github-runners$/"],
       "semanticCommitScope": "github-actions",
       "separateMajorMinor": false,
-      "addLabels": ["chore"]
+      "labels": ["chore"]
+    },
+    {
+      "description": "Group '# renovate:' comments in workflows with the github-actions manager, which also detects 'with: version' (depType uses-with)",
+      "groupName": "GitHub Actions",
+      "matchManagers": ["custom.regex"],
+      "matchFileNames": [".github/workflows/**"],
+      "semanticCommitScope": "github-actions",
+      "separateMajorMinor": false,
+      "labels": ["chore"]
     },
     {
       "groupName": "GitHub Runners",
@@ -47,7 +47,16 @@
       "matchDatasources": ["github-runners"],
       "semanticCommitScope": "github-actions",
       "separateMajorMinor": false,
-      "addLabels": ["chore"]
+      "labels": ["chore"]
+    },
+    {
+      "groupName": "golangci-lint",
+      "matchPackageNames": [
+        "github.com/golangci/golangci-lint/cmd/golangci-lint",
+        "golangci/golangci-lint",
+        "golangci/golangci-lint-action"
+      ],
+      "labels": ["chore"]
     },
     {
       "enabled": true,
@@ -84,20 +93,9 @@
       "addLabels": ["chore"]
     },
     {
-      "matchPackageNames": ["golang.org/x/net"],
-      "sourceUrl": "https://github.com/golang/net"
-    },
-    {
-      "matchPackageNames": ["golang.org/x/oauth2"],
-      "sourceUrl": "https://github.com/golang/oauth2"
-    },
-    {
-      "matchPackageNames": ["golang.org/x/sys"],
-      "sourceUrl": "https://github.com/golang/sys"
-    },
-    {
-      "matchPackageNames": ["golang.org/x/text"],
-      "sourceUrl": "https://github.com/golang/text"
+      "groupName": "golang.org/x",
+      "matchPackageNames": ["golang.org/x/**"],
+      "sourceUrl": "https://github.com/golang/{{{lookup (split packageName '/') 2}}}"
     },
     {
       "enabled": false,
@@ -135,7 +133,7 @@
         "golangci/golangci-lint",
         "golangci/golangci-lint-action"
       ]
-    },    
+    },
     {
       "description": "Keep Go dependencies compatible with the backport branches",
       "matchManagers": ["gomod"],