diff --git a/common_files/mergify.yml b/common_files/mergify.yml index 750deba..eefec32 100644 --- a/common_files/mergify.yml +++ b/common_files/mergify.yml @@ -90,6 +90,14 @@ pull_request_rules: backport: branches: - release_2.1 + - name: backport to 2.2 + conditions: + - base=integration + - label=backport-to-2.2 + actions: + backport: + branches: + - release_2.2 {% endif %} - name: approved merges actions: diff --git a/releases.json b/releases.json index 19ee3d1..2370c1f 100644 --- a/releases.json +++ b/releases.json @@ -44,9 +44,17 @@ "branch": "release_2.1", "title": "2.1", "alternate_title": "2_dot_1", - "latest": 1, + "latest": 0, "previous": "release_2.0", "tags": "v2.1.*" + }, + { + "branch": "release_2.2", + "title": "2.2", + "alternate_title": "2_dot_2", + "latest": 1, + "previous": "release_2.1", + "tags": "v2.2.*" } ], "inactives": [