From ae2bd26e586ec6b8024b8210716be382a4157521 Mon Sep 17 00:00:00 2001
From: Mahe Tardy <mahe.tardy@gmail.com>
Date: Thu, 6 Jun 2024 18:27:55 +0200
Subject: [PATCH] renovate: group all go updates together and fix a rule

Let's group the Go updates together regardless of the branch so that's
it's applied to everything. And fix a mistake committed in
f03102ca24c1172da539b31548d1ccba556a0d9e putting stables branches
instead of main branch in a package rule.

Signed-off-by: Mahe Tardy <mahe.tardy@gmail.com>
---
 .github/renovate.json5 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 5583f8601cc..712fe8fe6d8 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -213,15 +213,21 @@
       }
     },
     {
-      // main branch is using the new toolchain directive
+      // Grouping go packages updates together
       "groupName": "Go",
       "matchPackageNames": [
         "go",
         "docker.io/library/golang"
       ],
+    },
+    {
+      // main branch is using the new toolchain directive
+      "matchPackageNames": [
+        "go",
+        "docker.io/library/golang"
+      ],
       "matchBaseBranches": [
-        "v1.0",
-        "v1.1",
+        "main",
       ],
       // postUpgradeTasks is only for when the Go module directives are bumped
       "postUpgradeTasks": {
@@ -235,7 +241,6 @@
     },
     {
       // stable branches are using the go directive
-      "groupName": "Go",
       "matchPackageNames": [
         "go",
         "docker.io/library/golang"