Skip to content

Commit

Permalink
ci(mergify): Update configuration to avoid deprecation notices (#2179)
Browse files Browse the repository at this point in the history
- Rename `method` to `merge_method`
- Move merge settings to queue_rules (this required making a new queue to separate dependabot from non-dependabot.

This change has been made by @melink14 from the Mergify config editor.
  • Loading branch information
melink14 authored Aug 26, 2024
1 parent 482aeb7 commit 4e43cf1
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
queue_rules:
- name: default
conditions: [] # no extra conditions needed to get merged
- name: dependabot
# Each PR is one commit, but mergify may add merge commits when updating.
merge_method: squash
- name: non-dependabot
# Each PR is one commit, but may have extras added during review so squash.
merge_method: squash
# Uses original PR title and body for squashed commit message.
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
pull_request_rules:
- name: Auto-merge dependabot
Expand All @@ -10,9 +19,7 @@ pull_request_rules:
- author=dependabot[bot]
actions:
queue:
name: default
# Each PR is one commit, but mergify may add merge commits when updating.
method: squash
name: dependabot

- name: Have Dependabot rebase when conflict at head of queue
# It's not unusual for there to be a conflict between subsequent dependabot
Expand Down Expand Up @@ -50,11 +57,4 @@ pull_request_rules:
- author~=^(?:(?!dependabot).)*$
actions:
queue:
name: default
# Each PR is one commit, but may have extras added during review so squash.
method: squash
# Uses original PR title and body for squashed commit message.
commit_message_template: |
{{ title }} (#{{ number }})
{{ body }}
name: non-dependabot

0 comments on commit 4e43cf1

Please sign in to comment.