Skip to content

Commit

Permalink
Update master for 1.5.0 release (#2455)
Browse files Browse the repository at this point in the history
* Enable CI for 1.5.x branch
* Enable Mergify for 1.5.x branch
* Drop 1.2.x from Mergify
  • Loading branch information
jackkoenig committed Jan 12, 2022
1 parent d1ba3b0 commit 1ddb492
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/configs/mergify_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
conditions:
- status-success=all tests passed
branches:
- 1.2.x
- 1.3.x
- 1.4.x
- 1.5.x
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- master
- 1.5.x
- 1.4.x
- 1.3.x
- 1.2.x
Expand Down
30 changes: 15 additions & 15 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,62 +17,62 @@ 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
label_conflicts: bp-conflict
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
label_conflicts: bp-conflict
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
label_conflicts: bp-conflict
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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 1ddb492

Please sign in to comment.