diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95cab9cd3e..71461195be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -128,15 +128,11 @@ jobs: draft: false prerelease: false - - name: Checkout master branch + - name: Merge 2.2 -> master if: ${{ startsWith(steps.branch-name.outputs.tag, '2.2') }} # && steps.version.outputs.is_stable == 'true'}} - uses: actions/checkout@v2 - with: - ref: 'master' - - - name: Merge 2.2 to master branch - if: ${{ startsWith(steps.branch-name.outputs.tag, '2.2') }} # && steps.version.outputs.is_stable == 'true'}} - run: | - git merge origin/2.2 - git push origin - \ No newline at end of file + uses: devmasx/merge-branch@master + with: + type: now + from_branch: 2.2 + target_branch: master + github_token: ${{ github.token }}