diff --git a/.github/workflows/onpr_automerge.yaml b/.github/workflows/onpr_automerge.yaml index 672de6fd4..4cd483669 100644 --- a/.github/workflows/onpr_automerge.yaml +++ b/.github/workflows/onpr_automerge.yaml @@ -28,19 +28,16 @@ jobs: repo: context.repo.repo, labels: ['automerge'] }) - - name: Merge PR - if: steps.check_comment.outputs.automerge - uses: actions/github-script@v5 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const prNumber = context.payload.issue.number; - const owner = context.repo.owner; - const repo = context.repo.repo; - await github.pulls.merge({ - owner, - repo, - pull_number: prNumber, - merge_method: 'merge' - }); - console.log(`PR #${prNumber} merged successfully.`); + automerge: + runs-on: ubuntu-latest + needs: [labeler] + steps: + - id: automerge + if: ${{ github.event.issue.pull_request }} + name: automerge + uses: "pascalgn/automerge-action@v0.16.2" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + Build: + needs: automerge + uses: ./.github/workflows/onpush_builder.yaml