From 5d89bfa73c53484b92661339bd63d7a524ef3a39 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Fri, 18 Oct 2024 12:58:28 +0200 Subject: [PATCH] more renovate tweaks --- .github/renovate/basics/labels.json5 | 10 ++++----- .github/renovate/kinds/flux.json5 | 3 +-- .github/renovate/kinds/helm-values.json5 | 2 +- .github/renovate/main.json5 | 8 +++---- .github/renovate/special/automerge.json5 | 25 ---------------------- .github/renovate/special/customRules.json5 | 20 +++++++++++++++++ .github/renovate/updates/minor.json5 | 1 + 7 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 .github/renovate/special/automerge.json5 diff --git a/.github/renovate/basics/labels.json5 b/.github/renovate/basics/labels.json5 index 48158da9ed0..17cd3f44dff 100644 --- a/.github/renovate/basics/labels.json5 +++ b/.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"] } ] } diff --git a/.github/renovate/kinds/flux.json5 b/.github/renovate/kinds/flux.json5 index 2c315ed3b1e..06c8d691228 100644 --- a/.github/renovate/kinds/flux.json5 +++ b/.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-", }, - } diff --git a/.github/renovate/kinds/helm-values.json5 b/.github/renovate/kinds/helm-values.json5 index d7f27a9bd86..b1dac11edce 100644 --- a/.github/renovate/kinds/helm-values.json5 +++ b/.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 } diff --git a/.github/renovate/main.json5 b/.github/renovate/main.json5 index 9c0ec8162c9..d6abba90532 100644 --- a/.github/renovate/main.json5 +++ b/.github/renovate/main.json5 @@ -5,6 +5,7 @@ "automergeType": "pr", "pinDigests": true, "semanticCommits": "enabled", + "bumpVersion": true, "dependencyDashboard": true, "dependencyDashboardTitle": "Renovate Dashboard 🤖", gitAuthor: "TrueCharts-Admin ", @@ -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": [ diff --git a/.github/renovate/special/automerge.json5 b/.github/renovate/special/automerge.json5 deleted file mode 100644 index ca3872d3562..00000000000 --- a/.github/renovate/special/automerge.json5 +++ /dev/null @@ -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"] - } - ] -} diff --git a/.github/renovate/special/customRules.json5 b/.github/renovate/special/customRules.json5 index e4b6de0be1e..3f3304561bb 100644 --- a/.github/renovate/special/customRules.json5 +++ b/.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"] + }, ] } diff --git a/.github/renovate/updates/minor.json5 b/.github/renovate/updates/minor.json5 index d22a0ce7650..6ba558b4b50 100644 --- a/.github/renovate/updates/minor.json5 +++ b/.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