From 4fa3c85b0b766ffe6432bedba332b8119c77a421 Mon Sep 17 00:00:00 2001
From: Erick Bourgeois <erick@jeb.ca>
Date: Sun, 30 Aug 2026 09:55:06 -0400
Subject: [PATCH] ci(dependabot): group cargo and github-actions updates into
 one PR each
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The main ruleset requires up-to-date branches with linear history, so
every merge marks all other open PRs BEHIND and forces a rebase plus a
full ~20-minute CI cycle per PR. Five separate github-actions PRs
recently cost five serialized CI runs.

- cargo: extend the rust-dependencies catch-all group to majors (the
  kube-ecosystem group stays separate and first, since kube/k8s-openapi/
  kube-lease-manager must move as a unit)
- github-actions: add a catch-all group covering all update types

Dependabot now opens at most one weekly PR per ecosystem (two for cargo:
kube-ecosystem + everything else). Note: a major bump inside a group
makes the whole grouped PR report as major, so the auto-merge workflow
holds it for manual review — the fail-safe behavior is unchanged.

Signed-off-by: Erick Bourgeois <erick@jeb.ca>
---
 .github/dependabot.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 42d976fb..79d64df9 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -23,7 +23,8 @@ updates:
     commit-message:
       prefix: "deps"
       include: "scope"
-    # Group minor and patch updates together
+    # Group all updates together: one weekly PR for kube-ecosystem (which must
+    # move as a unit) and one for everything else, instead of a PR per crate.
     groups:
       # The kube ecosystem is tightly version-coupled: kube 4.x requires
       # k8s-openapi 0.28, and kube-lease-manager pins a specific kube minor.
@@ -44,6 +45,7 @@ updates:
         patterns:
           - "*"
         update-types:
+          - "major"
           - "minor"
           - "patch"
 
@@ -64,6 +66,17 @@ updates:
     commit-message:
       prefix: "ci"
       include: "scope"
+    # Group all action bumps into a single weekly PR — one CI cycle instead of
+    # a serialized chain (the main ruleset requires up-to-date branches, so N
+    # separate PRs cost N full CI runs).
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+          - "minor"
+          - "patch"
 
   # Docker base images
   - package-ecosystem: "docker"