ci: force rebase and autosquash before merging

Agoric · Aug 7, 2024 · e7c21af · e7c21af
1 parent fc104e8
commit e7c21af
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -65,6 +65,7 @@ pull_request_rules:
     conditions:
       - base=master
       - label=automerge:rebase
+      - linear-history
     actions:
       queue:
         merge_method: merge
@@ -76,3 +77,11 @@ pull_request_rules:
     actions:
       queue:
         merge_method: squash
+  - name: rebase and autosquash
+    conditions:
+      - base=master
+      - label=automerge:rebase
+      - -linear-history
+    actions:
+      rebase:
+        autosquash: true