dependabot automerge: use rebase merge strategy and approve the PR

TBD54566975 · Sep 25, 2024 · 494a5d2 · 494a5d2
1 parent b7a3592
commit 494a5d2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -98,8 +98,11 @@ jobs:
         uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Enable auto-merge for Dependabot PRs
+      - name: Approve and merge
         if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: gh pr merge --auto --merge "${{github.event.pull_request.html_url}}"
+        run: |
+          set -ex
+          gh pr review --approve "${{github.event.pull_request.html_url}}"
+          gh pr merge --auto --rebase "${{github.event.pull_request.html_url}}"
         env:
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}