From 5ec900db1b3b1a4d9c2b435f3e0c810cdd8be430 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Wed, 24 Apr 2024 01:40:53 -0700 Subject: [PATCH] ci: Bug fix: still need to auto-merge Actions-written PRs, but don't need to auto-approve any PRs --- .../workflows/{auto_approve_prs.yml => auto_merge_prs.yml} | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) rename .github/workflows/{auto_approve_prs.yml => auto_merge_prs.yml} (76%) diff --git a/.github/workflows/auto_approve_prs.yml b/.github/workflows/auto_merge_prs.yml similarity index 76% rename from .github/workflows/auto_approve_prs.yml rename to .github/workflows/auto_merge_prs.yml index e85fe51b..127973db 100644 --- a/.github/workflows/auto_approve_prs.yml +++ b/.github/workflows/auto_merge_prs.yml @@ -8,7 +8,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'Pr0methean' }} + if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'github-actions' || github.actor == 'Pr0methean' }} steps: - name: Dependabot metadata id: metadata @@ -16,11 +16,6 @@ jobs: uses: dependabot/fetch-metadata@v2.0.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - - name: Approve - 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 run: gh pr merge --auto --merge "$PR_URL" env: