From 347ef3e08b148f43b254b12c0001f8207ebbfadd Mon Sep 17 00:00:00 2001 From: burnettk Date: Mon, 5 Feb 2024 10:32:44 -0500 Subject: [PATCH] add required approval and merge instead of mark as auto merge --- .github/workflows/auto-merge-dependabot-prs.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-merge-dependabot-prs.yml b/.github/workflows/auto-merge-dependabot-prs.yml index 851ad9a4a..63b34d583 100644 --- a/.github/workflows/auto-merge-dependabot-prs.yml +++ b/.github/workflows/auto-merge-dependabot-prs.yml @@ -73,7 +73,14 @@ jobs: - name: print pr number run: cat pr_number - - name: actually merge it - run: gh pr merge --auto --merge "$(cat pr_number)" + # the repo requires one approval. if a dependabot change passes tests, that is good enough. + - name: approve pr + run: gh pr review --approve "$(cat pr_number)" + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + # if the merge --auto flag were added, and if the repo allowed it at https://github.com/sartography/spiff-arena/settings, + # it would set up the pr to auto merge when all requirements were met. but we just want to merge now. + - name: set up pr to auto merge when all requirements are met + run: gh pr merge --squash "$(cat pr_number)" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}