From 37bafb14b1cc3a11f32bde2068392ac1d1f1c952 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:01:37 -0700 Subject: [PATCH 1/2] ci: Bug fix? Use main token rather than PAT --- .github/workflows/auto_merge_prs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_merge_prs.yml b/.github/workflows/auto_merge_prs.yml index 8bb98235..c0d1c903 100644 --- a/.github/workflows/auto_merge_prs.yml +++ b/.github/workflows/auto_merge_prs.yml @@ -15,9 +15,9 @@ jobs: if: ${{ github.actor == 'dependabot[bot]' }} uses: dependabot/fetch-metadata@v2.1.0 with: - github-token: "${{ secrets.RELEASE_PLZ_PAT }}" + github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: "${{ secrets.RELEASE_PLZ_PAT }}" + GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 54dd12085b0263fd23492baf480712c080f9b5fb Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:04:22 -0700 Subject: [PATCH 2/2] ci: Bug fix? Use ${{github.token}} instead of ${{secrets.GITHUB_TOKEN}} --- .github/workflows/auto_merge_prs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_merge_prs.yml b/.github/workflows/auto_merge_prs.yml index c0d1c903..7cbf05d0 100644 --- a/.github/workflows/auto_merge_prs.yml +++ b/.github/workflows/auto_merge_prs.yml @@ -15,9 +15,10 @@ jobs: if: ${{ github.actor == 'dependabot[bot]' }} uses: dependabot/fetch-metadata@v2.1.0 with: - github-token: "${{ secrets.GITHUB_TOKEN }}" + github-token: "${{ github.token }}" - name: Enable auto-merge run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + OWNER: ${{ github.repository_owner }} + GH_TOKEN: "${{ github.token }}"