Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master for 3.5.0 release #2338

Merged
merged 1 commit into from
Jan 12, 2022
Merged

Update master for 3.5.0 release #2338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/configs/mergify_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
conditions:
- status-success=all tests passed
branches:
- 3.2.x
- 3.3.x
- 3.4.x
- 3.5.x
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
push:
branches:
- master
- 3.5.x
- 3.4.x
- 3.3.x
- 3.2.x
Expand Down
30 changes: 15 additions & 15 deletions .mergify.yml
View file
Open in desktop
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 3.4.x
- name: backport to 3.5.x
conditions:
- merged
- base=master
- milestone=3.4.x
- milestone=3.5.x
actions:
backport:
branches:
- 3.4.x
- 3.5.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: backport to 3.3.x, 3.4.x
- name: backport to 3.4.x, 3.5.x
conditions:
- merged
- base=master
- milestone=3.3.x
- milestone=3.4.x
actions:
backport:
branches:
- 3.3.x
- 3.4.x
- 3.5.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: backport to 3.2.x, 3.3.x, 3.4.x
- name: backport to 3.3.x, 3.4.x, 3.5.x
conditions:
- merged
- base=master
- milestone=3.2.x
- milestone=3.3.x
actions:
backport:
branches:
- 3.2.x
- 3.3.x
- 3.4.x
- 3.5.x
labels:
- Backport
ignore_conflicts: true
label_conflicts: bp-conflict
label:
add:
- Backported
- name: automatic squash-and-mege of 3.2.x backport PRs
- name: automatic squash-and-mege of 3.3.x backport PRs
conditions:
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=3.2.x
- base=3.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 3.3.x backport PRs
- name: automatic squash-and-mege of 3.4.x backport PRs
conditions:
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=3.3.x
- base=3.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 3.4.x backport PRs
- name: automatic squash-and-mege of 3.5.x backport PRs
conditions:
- status-success=all tests passed
- '#changes-requested-reviews-by=0'
- base=3.4.x
- base=3.5.x
- label="Backport"
- label!="DO NOT MERGE"
- label!="bp-conflict"
Expand Down