From 661028ff376cce7a020fa49f02d1d4162a270c71 Mon Sep 17 00:00:00 2001
From: nitrocode <7775707+nitrocode@users.noreply.github.com>
Date: Sun, 15 Sep 2024 08:13:14 -0500
Subject: [PATCH 1/2] ci(renovate): json5, best practices, labels, gha grouping

---
 .github/renovate.json5 | 34 ++++++++++++++++++++++++++++++++++
 renovate.json          |  6 ------
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 .github/renovate.json5
 delete mode 100644 renovate.json

diff --git a/.github/renovate.json5 b/.github/renovate.json5
new file mode 100644
index 00000000..dbf2b26d
--- /dev/null
+++ b/.github/renovate.json5
@@ -0,0 +1,34 @@
+{
+  $schema: "https://docs.renovatebot.com/renovate-schema.json",
+  extends: [
+    "config:best-practices",
+    ":separateMultipleMajorReleases",
+    ":semanticCommits",
+    ":semanticCommitTypeAll(chore)",
+    ":enablePreCommit",
+    "customManagers:dockerfileVersions",
+    "customManagers:githubActionsVersions",
+    "customManagers:helmChartYamlAppVersions",
+    "customManagers:makefileVersions",
+    "customManagers:mavenPropertyVersions",
+    "customManagers:tfvarsVersions",
+    "security:openssf-scorecard",
+  ],
+  labels: [
+    "dependencies",
+    "{{datasource}}",
+    "{{updateType}}"
+  ],
+  vulnerabilityAlerts: {
+    enabled: true,
+    assignees: [],
+    labels: ["security"]
+  },
+  packageRules: [
+    // For all public actions, renovate them once a week and group them together
+    {
+      "matchManagers": ["github-actions"],
+      "groupName": "github-actions",
+    },
+  ]
+}
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index 5db72dd6..00000000
--- a/renovate.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
-}

From 3d0ec39363e3d561c6825cea4f5479ea5ae0f0e8 Mon Sep 17 00:00:00 2001
From: nitrocode <7775707+nitrocode@users.noreply.github.com>
Date: Sun, 15 Sep 2024 08:17:52 -0500
Subject: [PATCH 2/2] ci: rm unnecessary extends

---
 .github/renovate.json5 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index dbf2b26d..43f05d41 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -8,9 +8,7 @@
     ":enablePreCommit",
     "customManagers:dockerfileVersions",
     "customManagers:githubActionsVersions",
-    "customManagers:helmChartYamlAppVersions",
     "customManagers:makefileVersions",
-    "customManagers:mavenPropertyVersions",
     "customManagers:tfvarsVersions",
     "security:openssf-scorecard",
   ],