-
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci(mergify): upgrade configuration to current format
- Loading branch information
1 parent
702a402
commit 5ecfffe
Showing
1 changed file
with
18 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,28 @@ | ||
|
||
pull_request_rules: | ||
# rebase+merge strategy | ||
- actions: | ||
- name: refactored queue action rule | ||
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: [] | ||
merge_method: merge | ||
update_method: merge | ||
method: squash | ||
- name: default | ||
conditions: [] | ||
queue_conditions: | ||
- label=merge me | ||
- 'check-success=Frontend_tests' | ||
- 'check-success~=.*Backend_tests.*' | ||
merge_conditions: [] | ||
merge_method: merge | ||
update_method: rebase |