diff --git a/.github/workflows/initiate_release.yml b/.github/workflows/initiate_release.yml index 5b6536844fc..78b3cabe8a5 100644 --- a/.github/workflows/initiate_release.yml +++ b/.github/workflows/initiate_release.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - version: ["14", "15"] + version: ["15", "16"] steps: - uses: octokit/request-action@v2.x diff --git a/.mergify.yml b/.mergify.yml index 54e1bce46f2..5e558062048 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -50,13 +50,13 @@ pull_request_rules: - version-15-hotfix assignees: - "{{ author }}" - - name: backport to version-16-beta + - name: backport to version-16-hotfix conditions: - - label="backport version-16-beta" + - label="backport version-16-hotfix" actions: backport: branches: - - version-16-beta + - version-16-hotfix assignees: - "{{ author }}" - name: Automatic merge on CI success and review