From 3c9ad021442cae2da526f7ce1dfa51c05f71f8fc Mon Sep 17 00:00:00 2001
From: mpoke <marius.poke@posteo.de>
Date: Thu, 12 Sep 2024 18:44:18 +0200
Subject: [PATCH] update mergify and dependabot

---
 .github/dependabot.yml | 12 +++++++++++-
 .mergify.yml           | 14 +++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d2d38c4c09..56a8733ad2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -62,7 +62,17 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    target-branch: "release/v5.1.x"
+    target-branch: "release/v5.2.x"
+    # Only allow automated security-related dependency updates on release branches.
+    open-pull-requests-limit: 0
+    labels:
+      - dependencies
+
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+    target-branch: "release/v6.0.x"
     # Only allow automated security-related dependency updates on release branches.
     open-pull-requests-limit: 0
     labels:
diff --git a/.mergify.yml b/.mergify.yml
index 6362f7d669..a82df6082b 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -42,11 +42,19 @@ pull_request_rules:
       backport:
         branches:
           - release/v5.x
-  - name: Backport patches to the release/v5.1.x branch
+  - name: Backport patches to the release/v5.2.x branch
     conditions:
       - base=main
-      - label=A:backport/v5.1.x
+      - label=A:backport/v5.2.x
     actions:
       backport:
         branches:
-          - release/v5.1.x
+          - release/v5.2.x
+  - name: Backport patches to the release/v6.0.x branch
+    conditions:
+      - base=main
+      - label=A:backport/v6.0.x
+    actions:
+      backport:
+        branches:
+          - release/v6.0.x