From 68e11eddfc76afab6b2af76a5495ce0d8abda753 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 12:17:49 +0000
Subject: [PATCH 1/3] Add renovate.json

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000..5db72dd6
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

From b05690882aafe67acb5e16dacfc72eb55007acb5 Mon Sep 17 00:00:00 2001
From: "Ware, Joseph (DLSLtd,RAL,LSCI)" <joseph.ware@diamond.ac.uk>
Date: Tue, 27 May 2025 13:24:47 +0100
Subject: [PATCH 2/3] Use all best practices recommends

---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 5db72dd6..48515b9f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended"
+    "config:best-practices"
   ]
 }

From 578baddc48b0aeb4dde1de283b63852b679fc119 Mon Sep 17 00:00:00 2001
From: "Ware, Joseph (DLSLtd,RAL,LSCI)" <joseph.ware@diamond.ac.uk>
Date: Tue, 27 May 2025 13:59:56 +0100
Subject: [PATCH 3/3] Manage github actions through copier template only

---
 renovate.json          | 12 ++++++++++++
 template/renovate.json | 30 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 template/renovate.json

diff --git a/renovate.json b/renovate.json
index 48515b9f..4e779c1f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,5 +2,17 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:best-practices"
+  ],
+  "packageRules": [
+    {
+      "groupName": "Templated CI",
+      "matchManagers": [
+        "github-actions"
+      ],
+      "description": [
+        "Group and update GitHub actions through the copier template to prevent merge conflicts"
+      ],
+      "automerge": true
+    }
   ]
 }
diff --git a/template/renovate.json b/template/renovate.json
new file mode 100644
index 00000000..178cf85b
--- /dev/null
+++ b/template/renovate.json
@@ -0,0 +1,30 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "config:recommendeds"
+    ],
+    "packageRules": [
+        {
+            "groupName": "Templated CI",
+            "matchDepNames": [
+                "actions/checkout",
+                "actions/download-artifact",
+                "actions/download-artifact",
+                "actions/setup-python",
+                "actions/upload-artifact",
+                "codecov/codecov-action",
+                "docker/build-push-action",
+                "docker/login-action",
+                "docker/metadata-action",
+                "docker/setup-buildx-action",
+                "peaceiris/actions-gh-pages",
+                "pypa/gh-action-pypi-publish",
+                "softprops/action-gh-release",
+                "ytanikin/pr-conventional-commits"
+            ],
+            "description": [
+                "Group and update GitHub actions through the copier template to prevent merge conflicts"
+            ]
+        }
+    ]
+}