From 3d46b7b3b9855c730f78f4059a2796bd63f00090 Mon Sep 17 00:00:00 2001
From: Nikita Volodin <volodin.n@gmail.com>
Date: Mon, 18 Sep 2023 11:34:17 -0400
Subject: [PATCH] feat(.github/renovate): update settings

- Some updates to match the template
- Changes to config files based on config validation script
- Point to config files within this repository
- Add group for github actions runner system
---
 .github/renovate.json5           | 15 ++++++++-------
 .github/renovate/autoMerge.json5 |  2 +-
 .github/renovate/groups.json5    | 14 +++++++++++++-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 613390b9f..82a322c3b 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     "docker:enableMajor",
     ":disableRateLimiting",
     ":dependencyDashboard",
@@ -9,18 +9,18 @@
     ":enablePreCommit",
     ":automergeDigest",
     ":automergeBranch",
-    "github>onedr0p/flux-cluster-template//.github/renovate/autoMerge.json5",
-    "github>onedr0p/flux-cluster-template//.github/renovate/commitMessage.json5",
-    "github>onedr0p/flux-cluster-template//.github/renovate/groups.json5",
-    "github>onedr0p/flux-cluster-template//.github/renovate/labels.json5",
-    "github>onedr0p/flux-cluster-template//.github/renovate/semanticCommits.json5",
+    "github>/.github/renovate/autoMerge.json5",
+    "github>/.github/renovate/commitMessage.json5",
+    "github>/.github/renovate/groups.json5",
+    "github>/.github/renovate/labels.json5",
+    "github>/.github/renovate/semanticCommits.json5",
     "helpers:pinGitHubActionDigests"
   ],
   "dependencyDashboard": true,
   "dependencyDashboardTitle": "Renovate Dashboard 🤖",
   "suppressNotifications": ["prIgnoreNotification"],
   "rebaseWhen": "conflicted",
-  "schedule": ["every saturday"],
+  "schedule": ["on saturday"],
   "pre-commit": {
     "enabled": true
   },
@@ -39,6 +39,7 @@
   "regexManagers": [
     {
       "description": "Process various other dependencies",
+      "customType": "regex",
       "fileMatch": [
         "ansible/.+\\.ya?ml$",
         "kubernetes/.+\\.ya?ml$"
diff --git a/.github/renovate/autoMerge.json5 b/.github/renovate/autoMerge.json5
index 8032cc200..c8d5fef3a 100644
--- a/.github/renovate/autoMerge.json5
+++ b/.github/renovate/autoMerge.json5
@@ -2,7 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
     {
-      "description": "Auto merge GitHub Actions",
+      "description": "Auto merge Github Actions",
       "matchManagers": ["github-actions"],
       "automerge": true,
       "automergeType": "branch",
diff --git a/.github/renovate/groups.json5 b/.github/renovate/groups.json5
index bf6a580d0..b1a82c6d9 100644
--- a/.github/renovate/groups.json5
+++ b/.github/renovate/groups.json5
@@ -2,10 +2,22 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
     {
-      "description": "Flux images and tags",
+      "description": "Flux Group",
       "groupName": "Flux",
       "matchPackagePatterns": ["flux"],
       "matchDatasources": ["docker", "github-tags"],
+      "versioning": "semver",
+      "group": {
+        "commitMessageTopic": "{{{groupName}}} group"
+      },
+      "separateMinorPatch": true
+    },
+    {
+      "description": "Github Actions Runner",
+      "groupName": "GithubActions",
+      "matchPackagePatterns": ["gha-runner-scale-set"],
+      "matchDatasources": ["docker"],
+      "versioning": "semver",
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
       },