refactor dependabot job

replicatedhq · Jan 2, 2024 · ab28ebd · ab28ebd
1 parent c3ae973
commit ab28ebd
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -3954,11 +3954,9 @@ jobs:
     needs: [ validate-success ]
     if: github.actor == 'dependabot[bot]'
     steps:
-      - name: Approve PR
-        run: gh pr review --approve ${{ github.event.pull_request.html_url }} --comment "LGTM :thumbsup:"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Merge PR
-        run: gh pr merge --auto --squash ${{ github.event.pull_request.html_url }}
+      - name: Approve & Merge PR
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr review --approve ${{ github.event.pull_request.html_url }} --comment "LGTM :thumbsup:"
+          gh pr merge --auto --squash ${{ github.event.pull_request.html_url }}