Merge pull request #49 from Mic92/mergify/configuration-deprecated-up…

…date ci(mergify): upgrade configuration to current format
Mic92 · Nov 25, 2024 · ad067ac · ad067ac
2 parents a3e2925 + 1d0c62a
commit ad067ac
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,17 +1,15 @@
 queue_rules:
   - name: default
+    queue_conditions:
+      - base=master
+      - label~=merge-queue|dependencies
     merge_conditions:
       - check-success=tests (mic92, mic92, nixpkgs=channel:nixos-unstable-small)
       - check-success=tests (mic92, mic92, nixpkgs=https://github.com/Mic92/nixpkgs/archive/main.tar.gz)
-defaults:
-  actions:
-    queue:
-      allow_merging_configuration_change: true
-      method: rebase
+    merge_method: rebase
+
 pull_request_rules:
   - name: merge using the merge queue
-    conditions:
-      - base=master
-      - label~=merge-queue|dependencies
+    conditions: []
     actions:
-      queue: {}
+      queue: