Skip to content

Commit

Permalink
github: Update mergify config to replace deprecated attributes
Browse files Browse the repository at this point in the history
!! 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 <anoopcs@samba.org>
  • Loading branch information
anoopcs9 authored and mergify[bot] committed Sep 4, 2024
1 parent 32375ce commit 47ec21a
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -22,6 +14,8 @@ queue_rules:
- check-success=test-kubernetes
- check-success=centos-ci/sink-clustered/mini-k8s-latest
- check-success=dpulls
merge_method: rebase
update_method: rebase


pull_request_rules:
Expand Down

0 comments on commit 47ec21a

Please sign in to comment.