From 3cae20e9818ffed27971b2a10cd3a0991001b0ee Mon Sep 17 00:00:00 2001 From: ktr Date: Wed, 17 Mar 2021 19:27:23 +0900 Subject: [PATCH] tweak dependabot.yml (#69) --- .github/{dependabot.yaml => dependabot.yml} | 0 .github/workflows/{automerge.yaml => approve_and_merge.yml} | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename .github/{dependabot.yaml => dependabot.yml} (100%) rename .github/workflows/{automerge.yaml => approve_and_merge.yml} (85%) diff --git a/.github/dependabot.yaml b/.github/dependabot.yml similarity index 100% rename from .github/dependabot.yaml rename to .github/dependabot.yml diff --git a/.github/workflows/automerge.yaml b/.github/workflows/approve_and_merge.yml similarity index 85% rename from .github/workflows/automerge.yaml rename to .github/workflows/approve_and_merge.yml index bd7eb1a..64027c7 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/approve_and_merge.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' steps: - - name: automerge + - name: Auto approve and merge Pull Request uses: actions/github-script@v3.1 with: github-token: "${{ secrets.GITHUB_TOKEN }}" @@ -15,10 +15,11 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, pull_number: context.issue.number, - event: 'APPROVE' + event: APPROVE }) await github.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.issue.number, + merge_method: squash })