Update merge.yml

robertcoltheart · Oct 13, 2023 · 1bf066e · 1bf066e
1 parent 92bc641
commit 1bf066e
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -6,13 +6,22 @@ permissions:
   pull-requests: write
 
 jobs:
-  dependabot:
+  merge:
     runs-on: ubuntu-latest
-    needs: [build]
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Approve a PR
+        run: gh pr review --approve "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}