From ba3900594fd6fbf3e5e90a2dceaef98d0758a039 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 5 Aug 2025 13:56:16 +0530 Subject: [PATCH 1/2] github: Fix mergify configuration ref: https://docs.mergify.com/configuration/file-format/#queue-rules Signed-off-by: Anoop C S --- .github/mergify.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index dafd5292..178c7a1b 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=check - check-success=build - check-success=podmanbuild @@ -71,8 +71,9 @@ pull_request_rules: - conflict actions: comment: - message: "This pull request now has conflicts with the target branch. - Please resolve these conflicts and force push the updated branch." + message: + "This pull request now has conflicts with the target branch. + Please resolve these conflicts and force push the updated branch." # Label PRs that have been sitting there unchanged, aging like a fine wine # # NOTE: the updated-at "counter" resets every time the PR is changed so From 970b75eeef5618027d88069e44d0b3fff8b44fa4 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 5 Aug 2025 13:58:31 +0530 Subject: [PATCH 2/2] githug: 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 178c7a1b..b49b278f 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -90,3 +90,6 @@ pull_request_rules: label: add: - "priority-review" + +merge_queue: + max_parallel_checks: 1