Browse Source

Update mergify configuration. (#7385)

Per https://blog.mergify.com/strict-mode-deprecation/, the strict mode
has been deprecated and will be turned off on 10-Jan-2022. This updates
the config to use the new, approved thing instead of the old thing.
pull/7388/head
M. J. Fromberger 3 years ago
committed by GitHub
parent
commit
2d4844f97f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      .github/mergify.yml

+ 8
- 3
.github/mergify.yml View File

@ -1,12 +1,18 @@
queue_rules:
- name: default
conditions:
- base=master
- label=S:automerge
pull_request_rules: pull_request_rules:
- name: Automerge to master - name: Automerge to master
conditions: conditions:
- base=master - base=master
- label=S:automerge - label=S:automerge
actions: actions:
merge:
queue:
method: squash method: squash
strict: smart+fasttrack
name: default
commit_message: title+body commit_message: title+body
- name: backport patches to v0.34.x branch - name: backport patches to v0.34.x branch
conditions: conditions:
@ -24,4 +30,3 @@ pull_request_rules:
backport: backport:
branches: branches:
- v0.35.x - v0.35.x

Loading…
Cancel
Save