Merge branch 'allegro:master' into deps-warnings

allegro · Nov 27, 2022 · b2712d7 · b2712d7
2 parents f8d69c7 + 60e437d
commit b2712d7
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 114 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,15 +3,16 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
-#
-#  Prototype for node ecosystem, needs to be configured
-#
-#  - package-ecosystem: "npm"
-#    directory: "/"
-#    schedule:
-#      interval: "daily"
-#    allow:
-#      # allow only production updates
-#      - dependency-name: "*"
-#        dependency-type: "production"
+      interval: "weekly"
+
+  - package-ecosystem: "bundler"
+    directory: "/docs"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "plywood*"
diff --git a/.mergify.yml b/.mergify.yml
@@ -8,12 +8,21 @@ pull_request_rules:
     actions:
       merge:
         method: rebase
-  - name: automatic merge for Node dependencies
+  - name: automatic merge for Ruby Gems
     conditions:
       - author=dependabot[bot]
       - check-success=required-checks # check required actions only
-      - label=npm # label assigned by dependabot
+      - label=bundler # label assigned by dependabot
       - base=master
     actions:
       merge:
         method: rebase
+#  - name: automatic merge for Node dependencies
+#    conditions:
+#      - author=dependabot[bot]
+#      - check-success=required-checks # check required actions only
+#      - label=npm # label assigned by dependabot
+#      - base=master
+#    actions:
+#      merge:
+#        method: rebase