From bbb5c0887252b1f78d784fb7ad8a67d748ff95ad Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Fri, 3 May 2024 10:41:57 -0700
Subject: [PATCH] update dependabot config; update related blast tweak (#261)

---
 .github/dependabot.yaml                       |  8 +++-----
 .../lib/src/tweaks/dependabot_tweak.dart      | 19 +++++++++++++------
 pkgs/blast_repo/test/dependabot_test.dart     | 16 ++++++++++++++--
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 14312188..492a82fe 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -9,8 +9,6 @@ updates:
     labels:
       - autosubmit
     groups:
-       dependencies:
-          patterns: ["*"]
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+      dependencies:
+        patterns:
+          - "*"
diff --git a/pkgs/blast_repo/lib/src/tweaks/dependabot_tweak.dart b/pkgs/blast_repo/lib/src/tweaks/dependabot_tweak.dart
index 72fa7d6d..f5de299a 100644
--- a/pkgs/blast_repo/lib/src/tweaks/dependabot_tweak.dart
+++ b/pkgs/blast_repo/lib/src/tweaks/dependabot_tweak.dart
@@ -156,9 +156,16 @@ Iterable<Object> _allowedActionValues() =>
 
 const _packageEcosystemKey = 'package-ecosystem';
 
-Map<String, Object> _githubActionValue(String frequency) => {
-      _packageEcosystemKey: 'github-actions',
-      'directory': '/',
-      'schedule': {'interval': frequency},
-      'labels': ['autosubmit'],
-    };
+Map<String, Object> _githubActionValue(String frequency) {
+  return {
+    _packageEcosystemKey: 'github-actions',
+    'directory': '/',
+    'schedule': {'interval': frequency},
+    'labels': ['autosubmit'],
+    'groups': {
+      'dependencies': {
+        'patterns': ['*']
+      }
+    },
+  };
+}
diff --git a/pkgs/blast_repo/test/dependabot_test.dart b/pkgs/blast_repo/test/dependabot_test.dart
index d88363e6..88195438 100644
--- a/pkgs/blast_repo/test/dependabot_test.dart
+++ b/pkgs/blast_repo/test/dependabot_test.dart
@@ -32,7 +32,7 @@ updates: "bob"
     final result = doDependabotFix(r'''
 #some comment
 version: 2
-enable-beta-ecosystems: true
+
 updates:
   - package-ecosystem: "pub"
     directory: "/"
@@ -43,7 +43,7 @@ updates:
     expect(result, r'''
 #some comment
 version: 2
-enable-beta-ecosystems: true
+
 updates:
   - package-ecosystem: "pub"
     directory: "/"
@@ -55,6 +55,10 @@ updates:
       interval: monthly
     labels:
       - autosubmit
+    groups:
+      dependencies:
+        patterns:
+          - "*"
 ''');
   });
 
@@ -74,6 +78,10 @@ updates:
       interval: "$frequency"
     labels:
       - autosubmit
+    groups:
+      dependencies:
+        patterns:
+          - "*"
 ''';
         final result = doDependabotFix(input);
 
@@ -104,4 +112,8 @@ updates:
       interval: monthly
     labels:
       - autosubmit
+    groups:
+      dependencies:
+        patterns:
+          - "*"
 ''';