From 90680d40fdac18915fbd3461c786f93120dc170a Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Mon, 4 Aug 2025 23:26:57 +0530 Subject: [PATCH 1/2] github: Fix a mergify configuration error ref: https://docs.mergify.com/configuration/file-format/#queue-rules Signed-off-by: Anoop C S --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 1cbbf39..9d0414c 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -5,7 +5,7 @@ # to dedup some of the check-x=y repetition in the future. queue_rules: - name: default - conditions: + queue_conditions: - check-success=checks - check-success=check-commits - check-success=build-server (default, centos, amd64) From 00c159236c53faf1c0b4cba21c6d8fc764d4a7ac Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Mon, 4 Aug 2025 23:27:56 +0530 Subject: [PATCH 2/2] github: Fix a mergify error Mergify won't merge changes due to the following error: "The branch protection setting Require branches to be up to date beforemerging is not compatible with max_parallel_checks>1, queue_conditions != merge_conditions and must be unset." Signed-off-by: Anoop C S --- .github/mergify.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index 9d0414c..5fafc19 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -127,3 +127,6 @@ pull_request_rules: label: add: - "priority-review" + +merge_queue: + max_parallel_checks: 1