diff options
| -rw-r--r-- | .github/configs/mergify_config.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 1 | ||||
| -rw-r--r-- | .mergify.yml | 30 |
3 files changed, 17 insertions, 16 deletions
diff --git a/.github/configs/mergify_config.yml b/.github/configs/mergify_config.yml index 90bf4ad5..6ffd32d4 100644 --- a/.github/configs/mergify_config.yml +++ b/.github/configs/mergify_config.yml @@ -2,6 +2,6 @@ conditions: - status-success=all tests passed branches: - - 1.2.x - 1.3.x - 1.4.x + - 1.5.x diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d50137ce..85e5bde6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - 1.5.x - 1.4.x - 1.3.x - 1.2.x 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" |