diff --git a/.backportrc.json b/.backportrc.json index 71b7729a865..95d8ec39237 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,6 +1,6 @@ { "upstream": "elastic/beats", - "branches": [ { "name": "7.x", "checked": true }, "7.13", "7.12" ], + "branches": [ { "name": "7.x", "checked": true }, "7.14", "7.13", "7.12" ], "labels": ["backport"], "autoAssign": true, "prTitle": "Cherry-pick to {targetBranch}: {commitMessages}" diff --git a/.mergify.yml b/.mergify.yml index a2a2c3ebbe5..d7d808e48ab 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -15,7 +15,7 @@ pull_request_rules: - name: backport patches to 7.x branch conditions: - merged - - label=backport-v7.14.0 + - label=backport-v7.15.0 actions: backport: assignees: @@ -106,3 +106,16 @@ pull_request_rules: - files~=^.go-version$ actions: delete_head_branch: + - name: backport patches to 7.14 branch + conditions: + - merged + - base=master + - label=backport-v7.14.0 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "7.14" + labels: + - "backport"