From 92b8749e3483711cd9bdb08ff18c335e79d172b3 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Tue, 23 Jul 2024 03:28:20 +0300 Subject: [PATCH] feat(renovate): move to ivuorinen/renovate-config --- .github/renovate.json | 4 +- .github/renovate/autoMerge.json5 | 21 ---- .github/renovate/commitMessage.json5 | 16 --- .github/renovate/labels.json5 | 49 -------- .github/renovate/semanticCommits.json5 | 151 ------------------------- renovate-config.json | 57 +--------- 6 files changed, 5 insertions(+), 293 deletions(-) delete mode 100644 .github/renovate/autoMerge.json5 delete mode 100644 .github/renovate/commitMessage.json5 delete mode 100644 .github/renovate/labels.json5 delete mode 100644 .github/renovate/semanticCommits.json5 diff --git a/.github/renovate.json b/.github/renovate.json index 80571e0..f02f654 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,4 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["github>ivuorinen/.github:renovate-config"] + "extends": [ + "github>ivuorinen/renovate-config" + ] } diff --git a/.github/renovate/autoMerge.json5 b/.github/renovate/autoMerge.json5 deleted file mode 100644 index 73d3cdc..0000000 --- a/.github/renovate/autoMerge.json5 +++ /dev/null @@ -1,21 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "packageRules": [ - { - "description": ["Auto-merge container digests updates for trusted containers"], - "matchDatasources": ["docker"], - "automerge": true, - "automergeType": "branch", - "matchUpdateTypes": ["digest"], - "matchPackagePatterns": ["ghcr.io/bjw-s", "ghcr.io/onedr0p"] - }, - { - "description": ["Auto-merge GitHub Actions for minor and patch"], - "matchManagers": ["github-actions"], - "matchDatasources": ["github-tags"], - "automerge": true, - "automergeType": "branch", - "matchUpdateTypes": ["minor", "patch"] - } - ] -} diff --git a/.github/renovate/commitMessage.json5 b/.github/renovate/commitMessage.json5 deleted file mode 100644 index 3fea628..0000000 --- a/.github/renovate/commitMessage.json5 +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "to {{newVersion}}", - "commitMessageSuffix": "", - "packageRules": [ - { - "matchDatasources": ["helm"], - "commitMessageTopic": "chart {{depName}}" - }, - { - "matchDatasources": ["docker"], - "commitMessageTopic": "image {{depName}}" - } - ] -} diff --git a/.github/renovate/labels.json5 b/.github/renovate/labels.json5 deleted file mode 100644 index e359566..0000000 --- a/.github/renovate/labels.json5 +++ /dev/null @@ -1,49 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "packageRules": [ - { - "matchUpdateTypes": ["major"], - "labels": ["type/major"] - }, - { - "matchUpdateTypes": ["minor"], - "labels": ["type/minor"] - }, - { - "matchUpdateTypes": ["patch"], - "labels": ["type/patch"] - }, - { - "matchUpdateTypes": ["digest"], - "labels": ["type/digest"] - }, - { - "matchDatasources": ["docker"], - "addLabels": ["renovate/container"] - }, - { - "matchDatasources": ["helm"], - "addLabels": ["renovate/helm"] - }, - { - "matchDatasources": ["galaxy", "galaxy-collection"], - "addLabels": ["renovate/ansible"] - }, - { - "matchDatasources": ["terraform-provider"], - "addLabels": ["renovate/terraform"] - }, - { - "matchDatasources": ["github-releases", "github-tags"], - "addLabels": ["renovate/github-release"] - }, - { - "matchManagers": ["github-actions"], - "addLabels": ["renovate/github-action"] - }, - { - "matchDatasources": ["pypi"], - "addLabels": ["renovate/pip"] - } - ] -} diff --git a/.github/renovate/semanticCommits.json5 b/.github/renovate/semanticCommits.json5 deleted file mode 100644 index 5d8bbb8..0000000 --- a/.github/renovate/semanticCommits.json5 +++ /dev/null @@ -1,151 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "packageRules": [ - { - "matchDatasources": ["docker"], - "matchUpdateTypes": ["major"], - "commitMessagePrefix": "feat(container)!: ", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": " ( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["docker"], - "matchUpdateTypes": ["minor"], - "semanticCommitType": "feat", - "semanticCommitScope": "container", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["docker"], - "matchUpdateTypes": ["patch"], - "semanticCommitType": "fix", - "semanticCommitScope": "container", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["docker"], - "matchUpdateTypes": ["digest"], - "semanticCommitType": "chore", - "semanticCommitScope": "container", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentDigestShort}} → {{newDigestShort}} )" - }, - { - "matchDatasources": ["helm"], - "matchUpdateTypes": ["major"], - "commitMessagePrefix": "feat(helm)!: ", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["helm"], - "matchUpdateTypes": ["minor"], - "semanticCommitType": "feat", - "semanticCommitScope": "helm", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["helm"], - "matchUpdateTypes": ["patch"], - "semanticCommitType": "fix", - "semanticCommitScope": "helm", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["galaxy", "galaxy-collection"], - "matchUpdateTypes": ["major"], - "commitMessagePrefix": "feat(ansible)!: ", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["galaxy", "galaxy-collection"], - "matchUpdateTypes": ["minor"], - "semanticCommitType": "feat", - "semanticCommitScope": "ansible", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["galaxy", "galaxy-collection"], - "matchUpdateTypes": ["patch"], - "semanticCommitType": "fix", - "semanticCommitScope": "ansible", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["terraform-provider"], - "matchUpdateTypes": ["major"], - "commitMessagePrefix": "feat(terraform)!: ", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["terraform-provider"], - "matchUpdateTypes": ["minor"], - "semanticCommitType": "feat", - "semanticCommitScope": "terraform", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["terraform-provider"], - "matchUpdateTypes": ["patch"], - "semanticCommitType": "fix", - "semanticCommitScope": "terraform", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["github-releases", "github-tags"], - "matchUpdateTypes": ["major"], - "commitMessagePrefix": "feat(github-release)!: ", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["github-releases", "github-tags"], - "matchUpdateTypes": ["minor"], - "semanticCommitType": "feat", - "semanticCommitScope": "github-release", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchDatasources": ["github-releases", "github-tags"], - "matchUpdateTypes": ["patch"], - "semanticCommitType": "fix", - "semanticCommitScope": "github-release", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchManagers": ["github-actions"], - "matchUpdateTypes": ["major"], - "commitMessagePrefix": "feat(github-action)!: ", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchManagers": ["github-actions"], - "matchUpdateTypes": ["minor"], - "semanticCommitType": "feat", - "semanticCommitScope": "github-action", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - }, - { - "matchManagers": ["github-actions"], - "matchUpdateTypes": ["patch"], - "semanticCommitType": "fix", - "semanticCommitScope": "github-action", - "commitMessageTopic": "{{depName}}", - "commitMessageExtra": "( {{currentVersion}} → {{newVersion}} )" - } - ] -} diff --git a/renovate-config.json b/renovate-config.json index b19e007..0c723f8 100644 --- a/renovate-config.json +++ b/renovate-config.json @@ -2,59 +2,6 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "description": "Renovate config for projects ivuorinen manages", "extends": [ - "config:recommended", - ":enableVulnerabilityAlerts", - ":labels(dependencies)", - ":maintainLockFilesWeekly", - ":preserveSemverRanges", - ":semanticCommits", - ":timezone(Europe/Helsinki)", - "github>ivuorinen/.github/.github/renovate/commitMessage.json5", - "github>ivuorinen/.github/.github/renovate/labels.json5", - "github>ivuorinen/.github/.github/renovate/semanticCommits.json5", - "docker:enableMajor", - "group:recommended", - "npm:unpublishSafe", - "replacements:all", - "schedule:nonOfficeHours", - "workarounds:all" - ], - "dependencyDashboardLabels": [ - "no-stale" - ], - "lockFileMaintenance": { - "extends": [ - "group:all" - ], - "commitMessageAction": "Update" - }, - "packageRules": [ - { - "matchPackagePatterns": [ - "eslint" - ], - "groupName": "eslint" - } - ], - "digest": { - "enabled": false - }, - "assigneesFromCodeOwners": true, - "configMigration": true, - "dependencyDashboardTitle": "Renovate Dashboard 🤖", - "ignorePaths": [ - "**/*.sops.*", - "**/.archive/**" - ], - "separateMajorMinor": true, - "separateMinorPatch": false, - "separateMultipleMajor": true, - "suppressNotifications": [ - "prEditedNotification", - "prIgnoreNotification" - ], - "vulnerabilityAlerts": { - "enabled": true - }, - "commitBody": "Signed-off-by: {{{gitAuthor}}}" + "github>ivuorinen/renovate-config" + ] }