ci: force rebase and autosquash before merging

Agoric · Aug 9, 2024 · b290b1b · b290b1b
1 parent 9c9e5cf
commit b290b1b
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -65,6 +65,9 @@ pull_request_rules:
     conditions:
       - base=master
       - label=automerge:rebase
+      - or:
+          - '#commits-behind>0'
+          - linear-history
     actions:
       queue:
         merge_method: merge
@@ -76,3 +79,15 @@ pull_request_rules:
     actions:
       queue:
         merge_method: squash
+  - name: rebase and autosquash
+    conditions:
+      - base=master
+      - label=automerge:rebase
+      - '#commits-behind=0'
+      - or:
+        - -linear-history
+        - check-failure=no-fixup-commits
+      - -draft
+    actions:
+      rebase:
+        autosquash: true