Squash Dependabot PRs

Signed-off-by: Andrej Orsula <orsula.andrej@gmail.com>
AndrejOrsula · Mar 11, 2024 · d0c2669 · d0c2669
1 parent ea827b5
commit d0c2669
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -8,20 +8,18 @@ permissions:
 jobs:
   dependabot_automation:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    env:
+      GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      PR_URL: ${{github.event.pull_request.html_url}}
     steps:
       - name: Fetch metadata
         id: metadata
         uses: dependabot/fetch-metadata@v1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve the PR
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
         run: gh pr review --approve "$PR_URL"
+        continue-on-error: true
       - name: Enable auto-merge for the PR
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"