Browse Source

Update mergify configuration. (backport #7385) (#7387)

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.

(cherry picked from commit 2d4844f97f)
pull/7390/head
mergify[bot] 3 years ago
committed by GitHub
parent
commit
ec2361eaf9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
  1. +10
    -12
      .github/mergify.yml

+ 10
- 12
.github/mergify.yml View File

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

Loading…
Cancel
Save