From 6eff42a5f5315cb333b4c0bd75b8919b9f12f34c Mon Sep 17 00:00:00 2001
From: truxnell <19149206+truxnell@users.noreply.github.com>
Date: Mon, 8 Apr 2024 11:55:39 +1000
Subject: [PATCH] feat: tweak renovate

---
 .github/renovate.json5           | 11 ++++++-----
 .github/renovate/autoMerge.json5 | 28 +++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 4e2571a..577bcaa 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -5,7 +5,6 @@
       "github>truxnell/renovate-config:automerge-github-actions",
       "github>truxnell/nix-config//.github/renovate/autoMerge.json5",
     ],
-    "autoMerge": "true",
     "gitAuthor": "Trux-Bot <19149206+trux-bot[bot]@users.noreply.github.com>",
     "ignoreTests": "false",
 
@@ -13,12 +12,14 @@
     // https://docs.renovatebot.com/modules/manager/nix/
     "nix": {
         "enabled": "true"
+        "autoMerge": "true"
     },
-   
+
     "lockFileMaintenance": {
-        "enabled": "true"
+        "enabled": "true",
+        "autoMerge": "true",
     },
-   
+
     "regexManagers": [
     {
       fileMatch: ["^.*\\.nix$"],
@@ -28,4 +29,4 @@
       datasourceTemplate: "docker",
     }
   ],
-}
\ No newline at end of file
+}
diff --git a/.github/renovate/autoMerge.json5 b/.github/renovate/autoMerge.json5
index c62751e..a7db03d 100644
--- a/.github/renovate/autoMerge.json5
+++ b/.github/renovate/autoMerge.json5
@@ -1,17 +1,31 @@
 {
-  packageRules: [
-    // auto update all up to major
+
+  // auto update up to major
+  "packageRules": [
     {
-      matchDatasources: ['docker'],
-      automerge: "true",
-      matchUpdateTypes: [ 'minor', 'patch', 'digest'],
-      matchPackageNames: [
+      "matchDatasources": ['docker'],
+      "automerge": "true",
+      "automergeType": "branch",
+      "matchUpdateTypes": [ 'minor', 'patch', 'digest'],
+      "matchPackageNames": [
         'onedr0p/sonarr',
         'onedr0p/readarr',
         'onedr0p/radarr',
         'onedr0p/lidarr',
         'onedr0p/prowlarr',
       ],
+
+  // auto update up to minor
+  "packageRules": [
+    {
+      "matchDatasources": ['docker'],
+      "automerge": "true",
+      "automergeType": "branch",
+      "matchUpdateTypes": [ 'patch', 'digest'],
+      "matchPackageNames": [
+        "gethomepage/homepage",
+      ],
+
     },
   ],
-}
\ No newline at end of file
+}