From a935d97501efb169ce6ab68b12f253062e2f8e05 Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Thu, 9 Apr 2026 16:05:08 +0000 Subject: [PATCH 1/4] [CI/Build] Update auto-rebase rule Signed-off-by: DarkLight1337 --- .github/mergify.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index e8ef4d49dd00..3ab199a6dd73 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -378,17 +378,17 @@ pull_request_rules: add: - tool-calling -- name: auto-rebase if approved, ready, and 40 commits behind main +- name: auto-rebase if approved, ready, but ~1 day behind main conditions: - base = main - label=ready - "#approved-reviews-by >= 1" - - "#commits-behind >= 40" + - "#commits-behind >= 50" - -closed - -draft - -conflict actions: - rebase: {} + update: {} - name: ping author on conflicts and add 'needs-rebase' label conditions: From 23f028fdaf63b28d10e47af0692dff33ea6f48d2 Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Thu, 9 Apr 2026 16:06:29 +0000 Subject: [PATCH 2/4] Rename Signed-off-by: DarkLight1337 --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 3ab199a6dd73..c2980f27ddb2 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -378,7 +378,7 @@ pull_request_rules: add: - tool-calling -- name: auto-rebase if approved, ready, but ~1 day behind main +- name: auto-rebase if approved and ready, but ~1 day behind main conditions: - base = main - label=ready From eef0c9444f3c21b80ba74cbdbb297eb5b0aa58d8 Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Thu, 9 Apr 2026 16:08:19 +0000 Subject: [PATCH 3/4] Rename Signed-off-by: DarkLight1337 --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index c2980f27ddb2..bc5e45aa5d7d 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -378,7 +378,7 @@ pull_request_rules: add: - tool-calling -- name: auto-rebase if approved and ready, but ~1 day behind main +- name: auto-rebase to keep candidate PRs within 1 day behind main conditions: - base = main - label=ready From 7e8b6d2dc62fe40aaf5f8f84e5e85f5159d9e65a Mon Sep 17 00:00:00 2001 From: DarkLight1337 Date: Thu, 9 Apr 2026 16:09:56 +0000 Subject: [PATCH 4/4] Rename Signed-off-by: DarkLight1337 --- .github/mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index bc5e45aa5d7d..4b815cbea71c 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -378,7 +378,7 @@ pull_request_rules: add: - tool-calling -- name: auto-rebase to keep candidate PRs within 1 day behind main +- name: auto-rebase to keep merge candidate within 1 day behind main conditions: - base = main - label=ready