update mergify configuration

Mic92 · Apr 23, 2024 · f024a66 · f024a66
1 parent 692fe3e
commit f024a66
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,14 +2,15 @@ queue_rules:
   - name: default
     merge_conditions:
       - check-success=self-test (macos-latest)
+      - check-success=self-test (macos-latest, --no-nom)
       - check-success=self-test (ubuntu-latest)
+      - check-success=self-test (ubuntu-latest, --no-nom)
       - check-success=tests (macos-latest)
       - check-success=tests (ubuntu-latest)
 defaults:
   actions:
     queue:
-      allow_merging_configuration_change: true
-      method: rebase
+      merge_method: rebase
 pull_request_rules:
   - name: merge using the merge queue
     conditions: