diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index d0c005c..bb9294f 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -67,13 +67,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Auto-merge PR - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - pull-request-number: ${{ steps.pr.outputs.pr_number }} - merge-method: squash - + - name: Merge PR + run: | + gh pr merge ${{ steps.pr.outputs.pr_number }} --squash --admin + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Wait for PR merge uses: actions/github-script@v7