Merge branch 'master' into cb/use-nixpkgs-rev-in-start

tweag · Dec 6, 2024 · afa7cfc · afa7cfc
2 parents 1d80ba6 + 8582df6
commit afa7cfc
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,25 +1,26 @@
-
-pull_request_rules:
-  - name: automatic merge
-    conditions:
+queue_rules:
+  - name: default
+    queue_conditions:
       - "label=merge-queue"
       - "base=master"
-    actions:
-      queue:
-        name: default
-        method: merge
+    merge_conditions: []
+    merge_method: merge
 
+pull_request_rules:
   - name: delete head branch after merge
     conditions:
       - merged
       - closed
     actions:
       delete_head_branch: {}
-
   - name: remove from merge-queue after merge
     conditions:
       - merged
     actions:
       label:
         remove:
           - "merge-queue"
+  - name: automatic merge
+    conditions: []
+    actions:
+      queue: