diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml index 1731a78ff9..2df542c58c 100644 --- a/.github/workflows/post-release-mergeback.yml +++ b/.github/workflows/post-release-mergeback.yml @@ -131,16 +131,6 @@ jobs: cat $PARTIAL_CHANGELOG echo "::endgroup::" - - name: Create mergeback branch and PR - if: ${{ steps.check.outputs.exists != 'true' && endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }} - uses: ./.github/actions/prepare-mergeback-branch - with: - base: "${{ env.BASE_BRANCH }}" - head: "${{ env.HEAD_BRANCH }}" - branch: "${{ steps.getVersion.outputs.newBranch }}" - version: "${{ steps.getVersion.outputs.version }}" - token: "${{ secrets.GITHUB_TOKEN }}" - - name: Generate token uses: actions/create-github-app-token@v2.1.4 id: app-token @@ -161,3 +151,13 @@ jobs: --latest=false \ --title "$VERSION" \ --notes-file "$PARTIAL_CHANGELOG" + + - name: Create mergeback branch and PR + if: ${{ endsWith(github.ref_name, steps.getVersion.outputs.latest_release_branch) }} + uses: ./.github/actions/prepare-mergeback-branch + with: + base: "${{ env.BASE_BRANCH }}" + head: "${{ env.HEAD_BRANCH }}" + branch: "${{ steps.getVersion.outputs.newBranch }}" + version: "${{ steps.getVersion.outputs.version }}" + token: "${{ secrets.GITHUB_TOKEN }}"