From 848f84fc3d5382f75b76b84b0da1c66ec54fb486 Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Wed, 18 Dec 2024 17:12:18 +0800
Subject: [PATCH 1/2] chore: update renovatebot settings

---
 .github/workflows/lint-test.yaml |  1 +
 renovate.json                    | 59 ++++++++++++++++++++++++++++----
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 4e9e840e..8c74c86f 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -117,6 +117,7 @@ jobs:
         run: ah lint
 
   artifacthub-changelog:
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'automated-dependencies') }}
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
diff --git a/renovate.json b/renovate.json
index da705a3e..d3a71c9d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,9 +1,54 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
+  "$schema":"https://docs.renovatebot.com/renovate-schema.json",
+  "extends":[
+     "mergeConfidence:all-badges",
+     "config:recommended",
+     ":disableRateLimiting",
+     "helpers:pinGitHubActionDigests"
   ],
-  "dependencyDashboard": true,
-  "platformCommit": "disabled",
-  "prHourlyLimit": 0
-}
+  "dependencyDashboard":true,
+  "platformCommit":"disabled",
+  "prHourlyLimit":0,
+  "labels":[
+     "automated-dependencies"
+  ],
+  "packageRules":[
+     {
+        "matchDatasources":[
+           "docker"
+        ],
+        "matchPackageNames":[
+           "ghcr.io/uselagoon/**",
+           "uselagoon/**"
+        ],
+        "groupName":"Lagoon service images"
+     },
+     {
+        "matchManagers":[
+           "github-actions"
+        ],
+        "groupName":"GitHub actions monthly minor/patch",
+        "matchUpdateTypes":[
+           "minor",
+           "patch",
+           "digest"
+        ],
+        "schedule":[
+           "on the first day of the month"
+        ],
+        "automerge":true,
+        "automergeType":"pr"
+     },
+     {
+        "matchManagers":[
+           "github-actions"
+        ],
+        "groupName":"GitHub actions major",
+        "matchUpdateTypes":[
+           "major"
+        ],
+        "automerge":true,
+        "automergeType":"pr"
+     }
+  ]
+}
\ No newline at end of file

From 27670abc263c4d4c55c1a3a5b2a05c27fc15ca55 Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Wed, 18 Dec 2024 17:23:07 +0800
Subject: [PATCH 2/2] chore: draftPR in some cases

---
 renovate.json | 116 ++++++++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/renovate.json b/renovate.json
index d3a71c9d..2bf6a9ec 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,54 +1,66 @@
 {
-  "$schema":"https://docs.renovatebot.com/renovate-schema.json",
-  "extends":[
-     "mergeConfidence:all-badges",
-     "config:recommended",
-     ":disableRateLimiting",
-     "helpers:pinGitHubActionDigests"
-  ],
-  "dependencyDashboard":true,
-  "platformCommit":"disabled",
-  "prHourlyLimit":0,
-  "labels":[
-     "automated-dependencies"
-  ],
-  "packageRules":[
-     {
-        "matchDatasources":[
-           "docker"
-        ],
-        "matchPackageNames":[
-           "ghcr.io/uselagoon/**",
-           "uselagoon/**"
-        ],
-        "groupName":"Lagoon service images"
-     },
-     {
-        "matchManagers":[
-           "github-actions"
-        ],
-        "groupName":"GitHub actions monthly minor/patch",
-        "matchUpdateTypes":[
-           "minor",
-           "patch",
-           "digest"
-        ],
-        "schedule":[
-           "on the first day of the month"
-        ],
-        "automerge":true,
-        "automergeType":"pr"
-     },
-     {
-        "matchManagers":[
-           "github-actions"
-        ],
-        "groupName":"GitHub actions major",
-        "matchUpdateTypes":[
-           "major"
-        ],
-        "automerge":true,
-        "automergeType":"pr"
-     }
-  ]
+   "$schema":"https://docs.renovatebot.com/renovate-schema.json",
+   "extends":[
+      "mergeConfidence:all-badges",
+      "config:recommended",
+      ":disableRateLimiting",
+      "helpers:pinGitHubActionDigests"
+   ],
+   "dependencyDashboard":true,
+   "platformCommit":"disabled",
+   "prHourlyLimit":0,
+   "labels":[
+      "automated-dependencies"
+   ],
+   "packageRules":[
+      {
+         "matchDatasources":[
+            "docker"
+         ],
+         "matchPackageNames":[
+            "ghcr.io/uselagoon/**",
+            "uselagoon/**"
+         ],
+         "groupName":"Lagoon service images"
+      },
+      {
+         "matchManagers":[
+            "github-actions"
+         ],
+         "groupName":"GitHub actions monthly minor/patch",
+         "matchUpdateTypes":[
+            "minor",
+            "patch",
+            "digest"
+         ],
+         "schedule":[
+            "on the first day of the month"
+         ],
+         "automerge":true,
+         "automergeType":"pr"
+      },
+      {
+         "matchManagers":[
+            "github-actions"
+         ],
+         "groupName":"GitHub actions major",
+         "matchUpdateTypes":[
+            "major"
+         ],
+         "automerge":true,
+         "automergeType":"pr"
+      },
+      {
+         "matchDatasources":[
+            "docker"
+         ],
+         "draftPR":true
+      },
+      {
+         "matchDatasources":[
+            "helm"
+         ],
+         "draftPR":true
+      }
+   ]
 }
\ No newline at end of file