diff --git a/.github/workflows/create-merge-release-into-dev-pr.yml b/.github/workflows/create-merge-release-into-dev-pr.yml index d11a316ac767..1d6217b1827f 100644 --- a/.github/workflows/create-merge-release-into-dev-pr.yml +++ b/.github/workflows/create-merge-release-into-dev-pr.yml @@ -25,13 +25,33 @@ jobs: echo "branch=${BRANCH}" >> $GITHUB_OUTPUT - create-pr: + try-merging: permissions: - pull-requests: write # for git push + contents: write # for git push runs-on: ubuntu-latest needs: setup timeout-minutes: 5 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: test-dev # TODO: DELETE ME + - name: Try merging + run: | + git merge --no-edit --no-ff "$RELEASE_BRANCH" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RELEASE_BRANCH: ${{ needs.setup.outputs.latest_release_branch }} + + create-pr: + permissions: + pull-requests: write # for creating pull request + + runs-on: ubuntu-latest + needs: [setup, try-merging] + timeout-minutes: 5 + if: false # TODO: DELETE ME steps: - name: Checkout repository uses: actions/checkout@v4