chore(deps): Update renovate configuration for more automation (#15886)

grafana · Jan 22, 2025 · be8fd95 · be8fd95
1 parent 81940c8
commit be8fd95
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -8,18 +8,16 @@
   ],
   "prHourlyLimit": 4,
   "baseBranches": [
-    "main"
+    "main",
+    "release-3.3.x", // Update when a new release is out, 2 minors, 1 major.
+    "release-3.2.x", // Also ensure to update the 'packageRules' section to match
+    "release-2.9.x"
   ],
   "packageRules": [
     {
-      "matchBaseBranches": [
-        "release-2.9.x",
-        "release-2.8.x"
-      ],
-      "enabled": false,
-      "matchPackageNames": [
-        "*"
-      ]
+      // Disable updates for all branches - we only want security updates
+      "matchBaseBranches": ["release-3.3.x", "release-3.2.x", "release-2.9.x"], 
+      "enabled": false
     },
     {
       // Disable Go version updates
@@ -60,12 +58,20 @@
       "automerge": false
     },
     {
-      // Enable all other updates
+      // Enable all other updates, and auto-merge minor and patch updates
       "matchFileNames": ["!operator/go.mod", "!operator/api/loki/go.mod"],
       "groupName": "{{packageName}}",
       "enabled": true,
-      "matchUpdateTypes": ["major", "minor", "patch"],
-      // After we have tested the above configuration, we can enable the following
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true,
+      "autoApprove": true
+    },
+    {
+      // Enable all other updates, don't auto-merge major updates
+      "matchFileNames": ["!operator/go.mod", "!operator/api/loki/go.mod"],
+      "groupName": "{{packageName}}",
+      "enabled": true,
+      "matchUpdateTypes": ["major"],
       "automerge": false,
       "autoApprove": false
     }
@@ -77,7 +83,9 @@
     "enabled": true,
     "addLabels": [
       "area/security"
-    ]
+    ],
+    "automerge": true, 
+    "autoApprove": true
   },
   "osvVulnerabilityAlerts": true,
   "prConcurrentLimit": 10,