Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new queue rules for mergify bot #2301

Merged
merged 7 commits into from
Oct 28, 2021
Merged

Use new queue rules for mergify bot #2301

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf2c783
Use new queue rules
jneira Oct 23, 2021
1a91e59
Add queue action
jneira Oct 25, 2021
ac95899
Remove method from the queue rule
jneira Oct 25, 2021
f65ed4c
Correct yaml
jneira Oct 25, 2021
6f79c6f
Merge branch 'master' into update-mergify
jneira Oct 25, 2021
c222f14
Comment about empty conditions
jneira Oct 28, 2021
d647333
Merge branch 'master' into update-mergify
jneira Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
queue_rules:
- name: default
# Mergify always respects the branch protection settings
# so we can left empty mergify own ones
conditions: []

pull_request_rules:
- actions:
merge:
strict: smart+fasttrack
method: squash
name: Automatically merge pull requests
- name: Automatically merge pull requests
conditions:
- label=merge me
- '#approved-reviews-by>=1'
actions:
queue:
method: squash
name: default