From b18a7b8d22c2a2e8a1b76c10cf4dc24d97a44198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 28 Jun 2021 12:06:15 +0200 Subject: [PATCH] Auto approve/merge also on stable branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .github/workflows/dependabot-approve-merge.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 860869221c4a8..e1b21b3a868ae 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -1,5 +1,9 @@ name: Dependabot -on: pull_request_target +on: + pull_request_target: + branches: + - master + - stable* jobs: auto-merge: @@ -7,15 +11,13 @@ jobs: steps: # Default github action approve - uses: hmarr/auto-approve-action@v2.0.0 - if: github.ref == 'refs/heads/master' && - (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') + if: (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') with: github-token: ${{ secrets.GITHUB_TOKEN }} # Nextcloud bot approve and merge request - uses: ahmadnassri/action-dependabot-auto-merge@v2 - if: github.ref == 'refs/heads/master' && - (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') + if: (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') with: target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}