From 2186478f06a1f20a9f7f43bbf22f9710a930c270 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 25 Apr 2023 07:23:20 +0200 Subject: [PATCH] [TASK] Streamline the auto-merge GitHub Actions workflow (#817) --- .github/workflows/{automerge.yml => auto-merge.yml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{automerge.yml => auto-merge.yml} (68%) diff --git a/.github/workflows/automerge.yml b/.github/workflows/auto-merge.yml similarity index 68% rename from .github/workflows/automerge.yml rename to .github/workflows/auto-merge.yml index 2d1befb..5ddf897 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,4 +1,5 @@ -name: automerge +# https://docs.github.com/en/github-ae@latest/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions +name: auto-merge on: # We're using pull_request_target instead of pull_request due to permission issues with the pull_request target: @@ -6,7 +7,7 @@ on: pull_request_target: jobs: - automerge: + auto-merge: name: Dependabot auto-merge runs-on: ubuntu-22.04 @@ -14,8 +15,7 @@ jobs: if: ${{ github.actor == 'dependabot[bot]' }} steps: - - name: Enable automerge - shell: bash + - name: Enable auto-merge run: gh pr merge -R "${{ github.repository }}" --squash --auto "${{ github.event.pull_request.number }}" env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}