From d35177ec71c5a8ed7e78ddfe6f612323990c3365 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Mon, 14 Sep 2026 20:42:40 +0200 Subject: [PATCH] chore(renovate): migrate the configuration to plain JSON The JSON5 syntax was not used for anything that JSON cannot express. The only comment-looking entry was already a `description` field, which renovate evaluates itself and which therefore survives the conversion. Plain JSON is the better default here, because it needs no dedicated parser in editors and tooling. The converted configuration was verified against the JSON5 parser to be structurally identical to its predecessor. Co-authored-by: Copilot --- .helmignore | 2 +- .vscode/settings.json | 3 +- renovate.json | 136 ++++++++++++++++++++++++++++++++++++++++++ renovate.json5 | 136 ------------------------------------------ 4 files changed, 138 insertions(+), 139 deletions(-) create mode 100644 renovate.json delete mode 100644 renovate.json5 diff --git a/.helmignore b/.helmignore index 43ad621..daaa518 100644 --- a/.helmignore +++ b/.helmignore @@ -36,6 +36,6 @@ unittests/ .prettierignore .yamllint CODEOWNERS -renovate.json5 +renovate.json .commitlintrc.json .gitsv/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 67adca7..02cc76b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,8 +4,7 @@ "/unittests/**/*.yaml" ], "https://docs.renovatebot.com/renovate-schema.json":[ - "renovate.json", - "renovate.json5" + "renovate.json" ] }, "yaml.schemaStore.enable": true, diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..09ee182 --- /dev/null +++ b/renovate.json @@ -0,0 +1,136 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "gitea>gitea/renovate-config", + "helpers:pinGitHubActionDigests", + ":automergeMinor", + "schedule:automergeDaily", + "schedule:weekends" + ], + "labels": [ + "kind/dependency" + ], + "digest": { + "automerge": true + }, + "automergeStrategy": "squash", + "git-submodules": { + "enabled": true + }, + "customManagers": [ + { + "description": "Gitea-version of https://docs.renovatebot.com/presets-regexManagers/#regexmanagersgithubactionsversions", + "customType": "regex", + "managerFilePatterns": [ + "/.gitea/workflows/.+\\.ya?ml$/" + ], + "matchStrings": [ + "# renovate: datasource=(?[a-z-.]+?) depName=(?[^\\s]+?)(?: (?:lookupName|packageName)=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*[\"']?(?.+?)[\"']?\\s" + ] + }, + { + "description": "Detect helm-unittest yaml schema file", + "customType": "regex", + "managerFilePatterns": [ + "/.vscode/settings\\.json$/" + ], + "matchStrings": [ + "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\s]+?)\\/(?v[0-9.]+?)\\/schema\\/helm-testsuite\\.json" + ], + "datasourceTemplate": "github-releases" + }, + { + "description": "Automatically detect new Gitea releases", + "customType": "regex", + "datasourceTemplate": "github-releases", + "depNameTemplate": "gitea/gitea", + "extractVersionTemplate": "^v(?.*)$", + "managerFilePatterns": [ + "/(^|/)Chart\\.ya?ml$/" + ], + "matchStrings": [ + "^appVersion:\\s+[\"']?(?\\S+)[\"']?$" + ] + } + ], + "lockFileMaintenance": { + "enabled": true, + "commitMessageAction": "update", + "commitMessageTopic": "lockfiles", + "schedule": [ + "at any time" + ] + }, + "packageRules": [ + { + "groupName": "subcharts (minor & patch)", + "matchManagers": [ + "helmv3" + ], + "matchUpdateTypes": [ + "minor", + "patch", + "digest" + ] + }, + { + "groupName": "bats testing framework", + "matchManagers": [ + "git-submodules" + ], + "matchUpdateTypes": [ + "minor", + "patch", + "digest" + ] + }, + { + "groupName": "workflow dependencies (minor & patch)", + "matchManagers": [ + "github-actions", + "npm", + "custom.regex" + ], + "matchUpdateTypes": [ + "minor", + "patch", + "digest" + ], + "matchFileNames": [ + "!Chart.yaml" + ] + }, + { + "description": "Update README.md on changes in values.yaml", + "matchManagers": [ + "helm-values" + ], + "postUpgradeTasks": { + "commands": [ + "install-tool node", + "make readme" + ], + "fileFilters": [ + "README.md" + ], + "executionMode": "update" + } + }, + { + "description": "Override changelog url for Helm image, to have release notes in our PRs", + "matchDepNames": [ + "alpine/helm" + ], + "changelogUrl": "https://github.com/helm/helm" + }, + { + "description": "Bump Gitea as fast as possible - not only on weekends", + "matchDepNames": [ + "go-gitea/gitea" + ], + "schedule": [ + "at any time" + ] + } + ] +} diff --git a/renovate.json5 b/renovate.json5 deleted file mode 100644 index 036895b..0000000 --- a/renovate.json5 +++ /dev/null @@ -1,136 +0,0 @@ -{ - $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: [ - "gitea>gitea/renovate-config", - "helpers:pinGitHubActionDigests", - ":automergeMinor", - "schedule:automergeDaily", - "schedule:weekends", - ], - labels: [ - "kind/dependency", - ], - digest: { - automerge: true, - }, - automergeStrategy: "squash", - "git-submodules": { - enabled: true, - }, - customManagers: [ - { - description: "Gitea-version of https://docs.renovatebot.com/presets-regexManagers/#regexmanagersgithubactionsversions", - customType: "regex", - managerFilePatterns: [ - "/.gitea/workflows/.+\\.ya?ml$/", - ], - matchStrings: [ - "# renovate: datasource=(?[a-z-.]+?) depName=(?[^\\s]+?)(?: (?:lookupName|packageName)=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*[\"']?(?.+?)[\"']?\\s", - ], - }, - { - description: "Detect helm-unittest yaml schema file", - customType: "regex", - managerFilePatterns: [ - "/.vscode/settings\\.json$/", - ], - matchStrings: [ - "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\s]+?)\\/(?v[0-9.]+?)\\/schema\\/helm-testsuite\\.json", - ], - datasourceTemplate: "github-releases", - }, - { - description: "Automatically detect new Gitea releases", - customType: "regex", - datasourceTemplate: "github-releases", - depNameTemplate: "gitea/gitea", - extractVersionTemplate: "^v(?.*)$", - managerFilePatterns: [ - "/(^|/)Chart\\.ya?ml$/", - ], - matchStrings: [ - "^appVersion:\\s+[\"']?(?\\S+)[\"']?$", - ], - }, - ], - lockFileMaintenance: { - "enabled": true, - "commitMessageAction": "update", - "commitMessageTopic": "lockfiles", - schedule: [ - "at any time", - ] - }, - packageRules: [ - { - groupName: "subcharts (minor & patch)", - matchManagers: [ - "helmv3", - ], - matchUpdateTypes: [ - "minor", - "patch", - "digest", - ], - }, - { - groupName: "bats testing framework", - matchManagers: [ - "git-submodules", - ], - matchUpdateTypes: [ - "minor", - "patch", - "digest", - ], - }, - { - groupName: "workflow dependencies (minor & patch)", - matchManagers: [ - "github-actions", - "npm", - "custom.regex", - ], - matchUpdateTypes: [ - "minor", - "patch", - "digest", - ], - matchFileNames: [ - "!Chart.yaml", - ], - }, - { - description: "Update README.md on changes in values.yaml", - matchManagers: [ - "helm-values", - ], - postUpgradeTasks: { - commands: [ - "install-tool node", - "make readme", - ], - fileFilters: [ - "README.md", - ], - executionMode: "update", - }, - }, - { - description: "Override changelog url for Helm image, to have release notes in our PRs", - matchDepNames: [ - "alpine/helm", - ], - changelogUrl: "https://github.com/helm/helm", - }, - { - description: "Bump Gitea as fast as possible - not only on weekends", - matchDepNames: [ - "go-gitea/gitea", - ], - schedule: [ - "at any time", - ], - }, - ], -}