From 403d77ff3fb894d825e569bbb0eeeb88b4a64b2d Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Wed, 22 Jan 2025 13:41:56 +0100 Subject: [PATCH] ci: squash and merge script update to allow merging less restrictively (#610) Fix branch status check for merge readiness Previously, any non-"CLEAN" status prevented merging. The check now specifically fails only if the branch is "BEHIND", allowing other statuses to proceed if valid. This ensures more accurate merge validations. --- release/ci/squash_and_merge_prs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/ci/squash_and_merge_prs.py b/release/ci/squash_and_merge_prs.py index 11bb67b5a4..28ffd5fc3a 100755 --- a/release/ci/squash_and_merge_prs.py +++ b/release/ci/squash_and_merge_prs.py @@ -73,7 +73,7 @@ def validate_pr(pr): if not merge_data.get('mergeable'): return False, "Merge conflicts detected" - if (mergeStateStatus := merge_data.get('mergeStateStatus')) != "CLEAN": + if (mergeStateStatus := merge_data.get('mergeStateStatus')) == "BEHIND": return False, f"Branch is `{mergeStateStatus}`" return True, None