From 5dc80213fb14f5a0f5dde61739ffaed97a4b7962 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Sun, 13 Oct 2024 12:21:50 +0200 Subject: [PATCH] add some prefixes to branches --- .github/renovate/kinds/astro.json5 | 1 + .github/renovate/kinds/docker.json5 | 1 + .github/renovate/kinds/flux.json5 | 2 +- .github/renovate/kinds/githubactions.json5 | 1 + .github/renovate/kinds/go.json5 | 1 + .github/renovate/kinds/helm-values.json5 | 1 + .github/renovate/kinds/helm.json5 | 1 + .github/renovate/special/automerge.json5 | 16 ++++++++++++++-- .../renovate/special/customClusterManagers.json5 | 6 ++++-- 9 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/renovate/kinds/astro.json5 b/.github/renovate/kinds/astro.json5 index caf29408ce1..42b2265f6d6 100644 --- a/.github/renovate/kinds/astro.json5 +++ b/.github/renovate/kinds/astro.json5 @@ -5,6 +5,7 @@ "(^|/)website/.+/astro\\.config\\.(mjs|js|ts)$", // Matches Astro config files in /website and any subdirectory "(^|/)website/.+/package\\.json$" // Matches package.json files in /website and any subdirectory ], + "branchPrefix": "astro-", "enabled": true, // Enable updates for website dependencies "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types "ignore": [ diff --git a/.github/renovate/kinds/docker.json5 b/.github/renovate/kinds/docker.json5 index 25f5ab7d7df..d8e785a6773 100644 --- a/.github/renovate/kinds/docker.json5 +++ b/.github/renovate/kinds/docker.json5 @@ -12,6 +12,7 @@ "(^|/)repositories/.+\\.ya?ml(?:\\.j2)?$", "(^|/)clustertool/embeded/.+\\.ya?ml(?:\\.j2)?$" ], + "branchPrefix": "docker-", "enabled": true, // Enable Docker image updates "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types "semanticCommitScope": "container", diff --git a/.github/renovate/kinds/flux.json5 b/.github/renovate/kinds/flux.json5 index 18df8f7efbf..3383ab5f294 100644 --- a/.github/renovate/kinds/flux.json5 +++ b/.github/renovate/kinds/flux.json5 @@ -11,7 +11,7 @@ "updateTypes": ["major", "minor", "patch"], // Allow updates for all version types "semanticCommitScope": "Flux Objects" }, - + "branchPrefix": "flux-", "ignore": [ // Add any global ignores here ], diff --git a/.github/renovate/kinds/githubactions.json5 b/.github/renovate/kinds/githubactions.json5 index 9b50fff89f7..e0861140f10 100644 --- a/.github/renovate/kinds/githubactions.json5 +++ b/.github/renovate/kinds/githubactions.json5 @@ -13,6 +13,7 @@ // Specify any actions or workflows to ignore ] }, + "branchPrefix": "githubactions-", "ignoreDeps": [ // List any dependencies to ignore globally if needed ], diff --git a/.github/renovate/kinds/go.json5 b/.github/renovate/kinds/go.json5 index 8e4a9e373a7..1008ac57332 100644 --- a/.github/renovate/kinds/go.json5 +++ b/.github/renovate/kinds/go.json5 @@ -13,6 +13,7 @@ ], "semanticCommitScope": "go" }, + "branchPrefix": "go-", "ignoreDeps": [ // List any dependencies to ignore globally if needed ], diff --git a/.github/renovate/kinds/helm-values.json5 b/.github/renovate/kinds/helm-values.json5 index 8342d1c9b4f..fd48dd6736c 100644 --- a/.github/renovate/kinds/helm-values.json5 +++ b/.github/renovate/kinds/helm-values.json5 @@ -12,6 +12,7 @@ "updateTypes": ["major", "minor", "patch", "digest"], // Allow updates for all version types "semanticCommitScope": "container" }, + "branchPrefix": "helm-values-", "ignore": [ // Add any global ignores here if needed ], diff --git a/.github/renovate/kinds/helm.json5 b/.github/renovate/kinds/helm.json5 index e3c56249624..5ea3b68e9bf 100644 --- a/.github/renovate/kinds/helm.json5 +++ b/.github/renovate/kinds/helm.json5 @@ -12,5 +12,6 @@ "ignore": [ // Add any global ignores here if needed ], + "branchPrefix": "helm-", "requiredStatusChecks": null } diff --git a/.github/renovate/special/automerge.json5 b/.github/renovate/special/automerge.json5 index 2480bfd1623..88c8656a39e 100644 --- a/.github/renovate/special/automerge.json5 +++ b/.github/renovate/special/automerge.json5 @@ -8,6 +8,16 @@ "automergeType": "pr", "matchUpdateTypes": ["digest", "patch", "minor"], "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ], + "branchPrefix": "docker-automerge-" + }, + { + "description": ["Auto-merge helm-values digests, patch and minor updates for trusted containers"], + "matchDatasources": ["helm-values"], + "automerge": true, + "automergeType": "pr", + "matchUpdateTypes": ["digest", "patch", "minor"], + "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p", "tccr.io/tccr/.*", "tccr.io/tccrbase/.*" ], + "branchPrefix": "helm-values-automerge-" }, { "description": ["Auto-merge chart updates, patch, and minor updates for OCI Helm charts from tccr.io/truecharts"], @@ -15,7 +25,8 @@ "automerge": true, "automergeType": "pr", "matchUpdateTypes": ["digest", "patch", "minor"], // Specify the types of updates to automate - "matchPackagePatterns": ["tccr.io/truecharts/.*"] // Matches all OCI Helm charts under tccr.io/truecharts + "matchPackagePatterns": ["tccr.io/truecharts/.*"], // Matches all OCI Helm charts under tccr.io/truecharts + "branchPrefix": "helm-automerge-" }, { "description": ["Auto-merge GitHub Actions for minor and patch"], @@ -23,7 +34,8 @@ "matchDatasources": ["github-tags"], "automerge": true, "automergeType": "pr", - "matchUpdateTypes": ["minor", "patch"] + "matchUpdateTypes": ["minor", "patch"], + "branchPrefix": "github-automerge-" } ] } \ No newline at end of file diff --git a/.github/renovate/special/customClusterManagers.json5 b/.github/renovate/special/customClusterManagers.json5 index 7889674fb13..12f3e0405d3 100644 --- a/.github/renovate/special/customClusterManagers.json5 +++ b/.github/renovate/special/customClusterManagers.json5 @@ -9,7 +9,8 @@ "datasource=(?\\S+) depName=(?\\S+)( repository=(?\\S+))?\\n.+: (&\\S+\\s)?(?\\S+)", "datasource=(?\\S+) depName=(?\\S+)\\n.+/(?(v|\\d)[^/]+)" ], - "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}" + "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}", + "branchPrefix": "regex-" }, { "customType": "regex", @@ -17,7 +18,8 @@ "fileMatch": ["(^|/)clusters/.+\\.ya?ml(?:\\.j2)?$"], "matchStrings": ["imageName: (?\\S+):(?.*\\-.*)"], "datasourceTemplate": "docker", - "versioningTemplate": "redhat" + "versioningTemplate": "redhat", + "branchPrefix": "regex-" } ] } \ No newline at end of file