diff options
| author | Jack Koenig | 2022-01-12 08:11:18 -0800 |
|---|---|---|
| committer | GitHub | 2022-01-12 08:11:18 -0800 |
| commit | 1ddb492ea3a5d5a817d8782dac229169adbc1153 (patch) | |
| tree | 3d35927ba27c5f9bc63959180023ce2c7d07937f /.mergify.yml | |
| parent | d1ba3b0c23886e4f7e11625f1458fb90b405effc (diff) | |
Update master for 1.5.0 release (#2455)
* Enable CI for 1.5.x branch
* Enable Mergify for 1.5.x branch
* Drop 1.2.x from Mergify
Diffstat (limited to '.mergify.yml')
| -rw-r--r-- | .mergify.yml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/.mergify.yml b/.mergify.yml index 1d699865..89f935ff 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -17,15 +17,15 @@ pull_request_rules: name: default method: squash update_method: merge -- name: backport to 1.4.x +- name: backport to 1.5.x conditions: - merged - base=master - - milestone=1.4.x + - milestone=1.5.x actions: backport: branches: - - 1.4.x + - 1.5.x labels: - Backport ignore_conflicts: true @@ -33,16 +33,16 @@ pull_request_rules: label: add: - Backported -- name: backport to 1.3.x, 1.4.x +- name: backport to 1.4.x, 1.5.x conditions: - merged - base=master - - milestone=1.3.x + - milestone=1.4.x actions: backport: branches: - - 1.3.x - 1.4.x + - 1.5.x labels: - Backport ignore_conflicts: true @@ -50,17 +50,17 @@ pull_request_rules: label: add: - Backported -- name: backport to 1.2.x, 1.3.x, 1.4.x +- name: backport to 1.3.x, 1.4.x, 1.5.x conditions: - merged - base=master - - milestone=1.2.x + - milestone=1.3.x actions: backport: branches: - - 1.2.x - 1.3.x - 1.4.x + - 1.5.x labels: - Backport ignore_conflicts: true @@ -68,11 +68,11 @@ pull_request_rules: label: add: - Backported -- name: automatic squash-and-mege of 1.2.x backport PRs +- name: automatic squash-and-mege of 1.3.x backport PRs conditions: - status-success=all tests passed - '#changes-requested-reviews-by=0' - - base=1.2.x + - base=1.3.x - label="Backport" - label!="DO NOT MERGE" - label!="bp-conflict" @@ -81,11 +81,11 @@ pull_request_rules: name: default method: squash update_method: merge -- name: automatic squash-and-mege of 1.3.x backport PRs +- name: automatic squash-and-mege of 1.4.x backport PRs conditions: - status-success=all tests passed - '#changes-requested-reviews-by=0' - - base=1.3.x + - base=1.4.x - label="Backport" - label!="DO NOT MERGE" - label!="bp-conflict" @@ -94,11 +94,11 @@ pull_request_rules: name: default method: squash update_method: merge -- name: automatic squash-and-mege of 1.4.x backport PRs +- name: automatic squash-and-mege of 1.5.x backport PRs conditions: - status-success=all tests passed - '#changes-requested-reviews-by=0' - - base=1.4.x + - base=1.5.x - label="Backport" - label!="DO NOT MERGE" - label!="bp-conflict" |