From 28f293d7c1ce4b0ff40d1f137b72a06ddd8d0dce Mon Sep 17 00:00:00 2001
From: Fraz Arshad <fraz.arshad12@gmail.com>
Date: Mon, 5 Aug 2024 19:59:05 +0500
Subject: [PATCH] fixup! ci: added check for fixup commits

ci: merge-ready-check
---
 .github/workflows/check-fixup-commits.yml | 2 +-
 .mergify.yml                              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check-fixup-commits.yml b/.github/workflows/check-fixup-commits.yml
index 1e498ed5d7fe..7c25b9e2f211 100644
--- 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
\ No newline at end of file
+          fi
diff --git a/.mergify.yml b/.mergify.yml
index 007b5f80117a..4ccecebb183f 100644
--- 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