fixup! ci: added check for fixup commits

ci: merge-ready-check
Agoric · Aug 6, 2024 · 28f293d · 28f293d
1 parent 27e3628
commit 28f293d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/check-fixup-commits.yml b/.github/workflows/check-fixup-commits.yml
@@ -35,4 +35,4 @@ jobs:
           else
             echo "Fixup commits found in commit history"
             exit 1
-          fi
+          fi
diff --git a/.mergify.yml b/.mergify.yml
@@ -45,6 +45,9 @@ queue_rules:
               - label=proto:expect-breakage
     merge_conditions:
       - base=master
+      - or:
+          - label=bypass:fixup
+          - check-success=check-fixup-commits
       # Require integration tests before merging only
       - or:
           - label=bypass:integration