diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 9e53104..e8654ff 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -1,22 +1,23 @@ name: Auto-merge Dependabot PRs -on: - workflow_run: - types: - - completed - workflows: - # List all required workflow names here. - - 'Run `pre-commit` on PRs' +on: pull_request + +permissions: + contents: write + pull-requests: write jobs: - merge-me: - name: Merge me! + dependabot: runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} steps: - - name: Merge me! - uses: ridedott/merge-me-action@v2 - with: - GITHUB_LOGIN: dependabot - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ENABLE_GITHUB_API_PREVIEW: true - MERGE_METHOD: REBASE + - 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}} + - name: Enable auto-merge for Dependabot PRs + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}