Setup workflow (#40)

OUXT-Polaris · Apr 18, 2023 · 285c4d7 · 285c4d7
1 parent c067ca2
commit 285c4d7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git 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/[email protected]
-        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