Merge pull request #332 from Homebrew/multi-ecosystem-groups

Author: MikeMcQuaid

.github/actions/sync/dependabot.template.yml

@@ -2,20 +2,21 @@
 # organisation so intentionally contains a superset of all required attributes.
 version: 2
 
-updates:
-  - package-ecosystem: github-actions
-    directory: /
+multi-ecosystem-groups:
+  all:
     schedule:
       interval: weekly
       day: "monday"
       time: "08:00"
       timezone: "Etc/UTC"
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    multi-ecosystem-group: "all"
+    patterns: ["*"]
     allow:
       - dependency-type: all
-    groups:
-      dependabot:
-        patterns:
-          - "*"
     cooldown:
       default-days: 1
       include:
@@ -25,17 +26,10 @@ updates:
     directories:
       - /
       - /Library/Homebrew
-    schedule:
-      interval: weekly
-      day: "monday"
-      time: "08:00"
-      timezone: "Etc/UTC"
+    multi-ecosystem-group: "all"
+    patterns: ["*"]
     allow:
       - dependency-type: all
-    groups:
-      dependabot:
-        patterns:
-          - "*"
     cooldown:
       default-days: 1
       semver-major-days: 14
@@ -46,17 +40,10 @@ updates:
 
   - package-ecosystem: npm
     directory: /
-    schedule:
-      interval: weekly
-      day: "monday"
-      time: "08:00"
-      timezone: "Etc/UTC"
+    multi-ecosystem-group: "all"
+    patterns: ["*"]
     allow:
       - dependency-type: all
-    groups:
-      dependabot:
-        patterns:
-          - "*"
     cooldown:
       default-days: 1
       semver-major-days: 14
@@ -67,31 +54,17 @@ updates:
 
   - package-ecosystem: docker
     directory: /
-    schedule:
-      interval: weekly
-      day: "monday"
-      time: "08:00"
-      timezone: "Etc/UTC"
+    multi-ecosystem-group: "all"
+    patterns: ["*"]
     allow:
       - dependency-type: all
-    groups:
-      dependabot:
-        patterns:
-          - "*"
 
   - package-ecosystem: devcontainers
     directory: /
-    schedule:
-      interval: weekly
-      day: "monday"
-      time: "08:00"
-      timezone: "Etc/UTC"
+    multi-ecosystem-group: "all"
+    patterns: ["*"]
     allow:
       - dependency-type: all
-    groups:
-      dependabot:
-        patterns:
-          - "*"
     cooldown:
       default-days: 1
       include:
@@ -101,17 +74,10 @@ updates:
     directories:
       - /
       - /Library/Homebrew/formula-analytics/
-    schedule:
-      interval: weekly
-      day: "monday"
-      time: "08:00"
-      timezone: "Etc/UTC"
+    multi-ecosystem-group: "all"
+    patterns: ["*"]
     allow:
       - dependency-type: all
-    groups:
-      dependabot:
-        patterns:
-          - "*"
     cooldown:
       default-days: 1
       semver-major-days: 14

.github/actions/sync/shared-config.rb

@@ -64,6 +64,11 @@ def git(*args)
 
 target_gemfile_locks = []
 dependabot_config_yaml = YAML.load_file(dependabot_template_yaml)
+# This should be run after dependabot.yml for this repository (Monday)
+# and after the sync-shared-config job for synced repositories (Wednesday).
+# This maximises the chance of a single sync per week handling both any
+# changes and any dependabot updates.
+dependabot_config_yaml["multi-ecosystem-groups"]["all"]["schedule"]["day"] = "friday"
 dependabot_config_yaml["updates"] = dependabot_config_yaml["updates"].filter_map do |update|
   bundler_ecosystem = false
   ecosystem_file = case update["package-ecosystem"]
@@ -98,12 +103,6 @@ def git(*args)
   end
   next unless keep_update
 
-  # This should be run after dependabot.yml for this repository (Monday)
-  # and after the sync-shared-config job for synced repositories (Wednesday).
-  # This maximises the chance of a single sync per week handling both any
-  # changes and any dependabot updates.
-  update["schedule"]["day"] = "friday"
-
   update
 end
 dependabot_config = dependabot_config_yaml.to_yaml