diff --git a/.github/workflows/BuildTest.yaml b/.github/workflows/BuildTest.yaml index 2de4cd8..185d17a 100644 --- a/.github/workflows/BuildTest.yaml +++ b/.github/workflows/BuildTest.yaml @@ -112,9 +112,8 @@ jobs: timeout-minutes: 180 needs: build steps: - - name: Merge PR - uses: nbrugger-tgm/merge-pr-action@v0.2.3 - if: contains( github.event.pull_request.labels.*.name, 'bot') && github.event_name == 'pull_request' - with : - token: ${{ secrets.GITHUB_TOKEN }} - method: squash + - name: merge PR + if : ${{ github.event_name == 'pull_request' }} && ${{ github.actor != 'wam-v-tan' }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh pr merge ${{ github.event.pull_request.html_url }} --merge