From f6257aef1c1e1357c1f610208fbfb6647d7a1e60 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Wed, 21 Aug 2024 17:09:09 +0530 Subject: [PATCH] github: Update mergify config to replace deprecated attributes !! Action Required !! The configuration uses the deprecated merge_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: [1] !! Action Required !! 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: [1] ref: https://docs.mergify.com/workflow/actions/queue/#parameters [1] https://docs.mergify.com/configuration/file-format/#queue-rules Signed-off-by: Anoop C S --- .github/mergify.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8a08374e..bd4d41da 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,12 +1,4 @@ --- -defaults: - actions: - queue: - name: default - method: rebase - update_method: rebase - - # each test should be listed separately, do not use regular expressions: # https://docs.mergify.io/conditions.html#validating-all-status-check # TODO: Use mergify's recently added 'shared configuration support' @@ -41,6 +33,8 @@ queue_rules: - check-success=test-ad-server-kubernetes (nightly, centos, amd64) - check-success=test-ad-server-kubernetes (nightly, fedora, amd64) - check-success=dpulls + merge_method: rebase + update_method: rebase pull_request_rules: