From a50df743b4c026c1a6975c56e24109c72e116c77 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 26 Jun 2026 17:05:39 +0200 Subject: [PATCH] Fix Mergify configuration validation errors - Move merge_method from defaults to queue_rules section - Replace deprecated 'conditions' with 'merge_conditions' in queue_rules - Remove deprecated 'delete_head_branch' action from pull request rules Assisted-By: AskBob Signed-off-by: Niels de Vos --- .github/mergify.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 4d0948c..c79be8c 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -3,12 +3,11 @@ defaults: actions: queue: name: default - method: rebase - update_method: rebase queue_rules: - name: default - conditions: + merge_method: rebase + merge_conditions: - check-success=test-lint - check-success=test-protoc @@ -32,7 +31,6 @@ pull_request_rules: actions: queue: {} dismiss_reviews: {} - delete_head_branch: {} - name: design changes needs approval from at least one core maintainer conditions: @@ -46,7 +44,6 @@ pull_request_rules: actions: queue: {} dismiss_reviews: {} - delete_head_branch: {} - name: label design changes (update the generated Go files) conditions: