istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve control for auto-cherry picking to specific release branches. (#4674)

This commit is contained in:
Martin Taillefer 2019-07-18 09:53:00 -07:00 committed by GitHub
parent 0ab449a961
commit 5370eff22e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.mergify.yml
View File

@ -11,12 +11,21 @@ pull_request_rules:
actions:
merge:
method: squash
strict: true
strict: false
- name: Automatically cherry pick a PR from master to the release branch if the right label is set
- name: Automatically cherry pick a PR from master to the release-1.2 branch if the right label is set
conditions:
- base=master
- label=action/merge-to-release-branch
- label=action/merge-to-release-1.2-branch
actions:
backport:
branches:
- release-1.2
- name: Automatically cherry pick a PR from master to the release-1.3 branch if the right label is set
conditions:
- base=master
- label=action/merge-to-release-1.3-branch
actions:
backport:
branches:
@ -24,7 +33,7 @@ pull_request_rules:
- name: Automatically cherry pick a PR from the release branch to master if the right label is set
conditions:
- base=release-1.2
- base~=release-?.?
- label=action/merge-to-master
actions:
backport: