From dfd725f6b1b64930a3bf8bae6e8dbd927131a2cb Mon Sep 17 00:00:00 2001 From: Liam Bigelow <40188355+bglw@users.noreply.github.com> Date: Sun, 31 Aug 2025 22:19:29 +1200 Subject: [PATCH] Improve dependabot auto-approval --- .github/workflows/dependabot.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 74c1a0d..f30a02b 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -5,20 +5,25 @@ on: pull_request_target jobs: auto-merge: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'pagefind/pagefind' steps: - - uses: actions/checkout@v2 - name: Get Token id: get_workflow_token uses: peter-murray/workflow-application-token-action@v2 with: application_id: ${{ secrets.PF_BOT_ID }} application_private_key: ${{ secrets.PF_BOT_PEM }} - - uses: fastify/github-action-merge-dependabot@v3.0.0 + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v2 with: - github-token: ${{ steps.get_workflow_token.outputs.token }} - target: minor - approve-only: true + github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Approve PR if patch or minor + if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }} - name: Enable auto-merge for Dependabot PR run: gh pr merge --auto --merge "$PR_URL" env: