Revert to manual gh execution

mondoohq · Nov 28, 2024 · 4243ca2 · 4243ca2
1 parent 6aece5a
commit 4243ca2
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/pr-test-lint.yml b/.github/workflows/pr-test-lint.yml
@@ -143,11 +143,12 @@ jobs:
           app-id: ${{ secrets.MONDOO_MERGEBOT_APP_ID }}
           private-key: ${{ secrets.MONDOO_MERGEBOT_APP_PRIVATE_KEY }}
       # automerge using bot token
-      - uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          pull-request-number: ${{ github.event.pull_request.number }}
-          merge-method: squash
-          token: ${{ steps.generate-token.outputs.token }} 
+      - name: Approve and merge a PR
+        run: |
+          gh pr review ${{ steps.pr.outputs.number }} --approve
+          gh pr merge ${{ steps.pr.outputs.number }} --squash --merge "1"
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
   event_file:
     name: "Store event file"
     runs-on: ubuntu-latest