From 0521b2ceccfc5f8d997db3e4bc080f0207e8ec37 Mon Sep 17 00:00:00 2001 From: Leon Schoorl Date: Fri, 23 Aug 2024 16:02:48 +0200 Subject: [PATCH 1/2] Update mergify config It was reporting: The configuration uses the deprecated update_method attribute of the queue action in one or more pull_request_rules. It must now be used under the queue_rules configuration. A brownout is planned on August 26th, 2024. This option will be removed on September 23rd, 2024. For more information: https://docs.mergify.com/configuration/file-format/#queue-rules --- .mergify.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index c30a5f7bf8..868f44640a 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -34,8 +34,6 @@ pull_request_rules: ignore_conflicts: True branches: - "1.6" - queue: - update_method: rebase - name: backport patches to 1.8 conditions: @@ -47,5 +45,6 @@ pull_request_rules: ignore_conflicts: True branches: - "1.8" - queue: - update_method: rebase + +queue_rules: + update_method: rebase From 031fe0a3bc69cf45909f8692a27f89bc9d8cf650 Mon Sep 17 00:00:00 2001 From: Leon Schoorl Date: Fri, 23 Aug 2024 16:58:45 +0200 Subject: [PATCH 2/2] Fixup config format --- .mergify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 868f44640a..8dceebf650 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -47,4 +47,5 @@ pull_request_rules: - "1.8" queue_rules: - update_method: rebase + - name: merge-queue + update_method: rebase