more renovate tweaks

.github/renovate/basics/labels.json5

@@ -1,17 +1,13 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
-    {
-      "matchManagers": ["helmv3"],
-      "addLabels": ["renovate/helm"]
-    },
     {
       "matchUpdateTypes": ["major"],
       "labels": ["type/major"]
     },
     {
       "matchUpdateTypes": ["minor"],
-      "labels": ["type/minor"]
+      "labels": ["type/minor", "automerge"]
     },
     {
       "matchUpdateTypes": ["patch"],
@@ -40,6 +36,10 @@
     {
       "matchManagers": ["github-actions"],
       "addLabels": ["renovate/github-action"]
+    },
+    {
+      "matchManagers": ["helmv3"],
+      "addLabels": ["renovate/helm"]
     }
   ]
 }

.github/renovate/kinds/flux.json5

@@ -9,9 +9,8 @@
     ],
     "enabled": true, // Enable Flux updates
     "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types
-    "semanticCommitScope": "Flux Objects",
+    "semanticCommitScope": "flux",
     "pinDigests": false, // Set to false to not pin digest references
     "branchPrefix": "flux-",
   },
-
 }

.github/renovate/kinds/helm-values.json5

@@ -10,7 +10,7 @@
     ],
     "enabled": true, // Enable image reference updates in values.yaml
     "updateTypes": ["major", "minor", "patch", "digest", "pin"], // Allow updates for all version types
-    "semanticCommitScope": "container",
+    "semanticCommitScope": "helm",
     "bumpVersion": true,
     "branchPrefix": "helm-values-",      // Moved to helm-values scope
   }

.github/renovate/main.json5

@@ -5,6 +5,7 @@
   "automergeType": "pr",
   "pinDigests": true,
     "semanticCommits": "enabled",
+    "bumpVersion": true,
   "dependencyDashboard": true,
   "dependencyDashboardTitle": "Renovate Dashboard 🤖",
   gitAuthor: "TrueCharts-Admin <bot@truecharts.org>",
@@ -29,13 +30,12 @@
         "github>truecharts/public//.github/renovate/kinds/helm-values.json5",
         "github>truecharts/public//.github/renovate/kinds/helm.json5",
         "github>truecharts/public//.github/renovate/special/groups.json5",
-        "github>truecharts/public//.github/renovate/special/automerge.json5",
-        "github>truecharts/public//.github/renovate/special/customRules.json5",
-        "github>truecharts/public//.github/renovate/special/customVersioning.json5",
         "github>truecharts/public//.github/renovate/special/schedules.json5",
         "github>truecharts/public//.github/renovate/basics/commitMessage.json5",
         "github>truecharts/public//.github/renovate/basics/labels.json5",
-        "github>truecharts/public//.github/renovate/special/customClusterManagers.json5"
+        "github>truecharts/public//.github/renovate/special/customClusterManagers.json5",
+        "github>truecharts/public//.github/renovate/special/customRules.json5",
+        "github>truecharts/public//.github/renovate/special/customVersioning.json5"
       ],
   // Main Renovate configuration that lists package rules for various paths
   "packageRules": [

.github/renovate/special/automerge.json5

@@ -1,25 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "packageRules": [
-    {
-      "description": ["Auto-merge minor updates from trusted sources"],
-      "matchDatasources": ["docker", "helm", "flux"],
-      "automerge": true,
-      "bumpVersion": true,
-      "matchUpdateTypes": ["minor"],
-      "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*", "tccr.io/truecharts/.*", "ghcr.io/elfhosted.*", "common" ],
-      "branchPrefix": "trusted-automerge-",
-      "labels": ["type/minor", "automerge"]
-    },
-    {
-      "description": ["Auto-merge GitHub Actions for minor and patch"],
-      "matchManagers": ["github-actions"],
-      "matchDatasources": ["github-tags"],
-      "automerge": true,
-      "bumpVersion": true,
-      "matchUpdateTypes": ["minor"],
-      "branchPrefix": "github-automerge-",
-      "labels": ["type/minor", "automerge"]
-    }
-  ]
-}

.github/renovate/special/customRules.json5

@@ -1,5 +1,25 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
+    {
+      "description": ["Block automerge for unstable minors"],
+      "automerge": false,
+      "matchUpdateTypes": ["minor"],
+      "matchPackagePatterns": [
+        "placeholder",
+        ],
+      "branchPrefix": "block-automerge-minor",
+      "labels": ["type/minor", "unstable"]
+    },
+    {
+      "description": ["Block automerge for unstable patches"],
+      "automerge": false,
+      "matchUpdateTypes": ["minor", "pin", "digest", "lockfile"],
+      "matchPackagePatterns": [
+        "placeholder",
+        ],
+      "branchPrefix": "block-automerge-patch",
+      "labels": ["type/minor", "unstable"]
+    },
   ]
 }

.github/renovate/updates/minor.json5

@@ -2,6 +2,7 @@
       "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "minor": {
     "enabled": true, // Enable minor updates
+    "automerge": true
   },
   "ignore": [
     // Add any paths or patterns to ignore specific minor updates, if necessary