Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format (#795)
Browse files Browse the repository at this point in the history
Co-authored-by: Mergify <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
mergify[bot] authored Nov 25, 2024
1 parent 01e663c commit 367ff80
Showing 1 changed file with 18 additions and 23 deletions.
41 changes: 18 additions & 23 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,28 @@

pull_request_rules:
# rebase+merge strategy
- actions:
- name: Put pull requests in the rebase+merge queue + Put pull requests in the squash+merge
queue
conditions: []
actions:
queue:
name: default
# Merge into master with a merge commit
method: merge
# Update the pr branch with rebase, so the history is clean
update_method: rebase
name: Put pull requests in the rebase+merge queue
conditions:
queue_rules:
- name: duplicated default from Put pull requests in the squash+merge queue
queue_conditions:
- label=merge me
- 'check-success=Frontend_tests'
- 'check-success~=.*Backend_tests.*'
# - '#approved-reviews-by>=1'
# merge+squash strategy
- actions:
queue:
name: default
method: squash
# both update methods get absorbed by the squash, so we use the most
# reliable
update_method: merge
name: Put pull requests in the squash+merge queue
conditions:
- label=squash+merge me
- 'check-success=Frontend_tests'
- 'check-success=Backend_tests'
# - '#approved-reviews-by>=1'

queue_rules:
merge_conditions: []
update_method: merge
merge_method: squash
- name: default
conditions: []
queue_conditions:
- label=merge me
- 'check-success=Frontend_tests'
- 'check-success~=.*Backend_tests.*'
merge_conditions: []
update_method: rebase
merge_method: merge

0 comments on commit 367ff80

Please sign in to comment.