Skip to content
Snippets Groups Projects
Unverified Commit bd4d1d9b authored by Francesco Gazzetta's avatar Francesco Gazzetta Committed by GitHub
Browse files

ci(Mergify): configuration update (#7592)


* use queues
* rebase+merge strategy
* merge+squash strategy

Signed-off-by: Francesco Gazzetta's avatarFrancesco Gazzetta <fgaz@fgaz.me>
parent 4dd8aa4f
Branches gb/no-reconfigure-test-flags
No related tags found
No related merge requests found
pull_request_rules:
# rebase+merge strategy
- actions:
merge:
strict: smart+fasttrack
method: squash
name: Automatically merge pull requests
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:
- label=merge me
- '#approved-reviews-by>=2'
\ No newline at end of file
- '#approved-reviews-by>=2'
# 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
- '#approved-reviews-by>=2'
queue_rules:
- name: default
conditions: []
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment