diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-06-28 12:06:15 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2021-06-28 12:11:12 +0200 |
| commit | b18a7b8d22c2a2e8a1b76c10cf4dc24d97a44198 (patch) | |
| tree | 0d3e452b2e9eb53224f50ac8c22816af83d2e0de /.github | |
| parent | ac97873a179d9383c682d10e88c750c3b6a72f79 (diff) | |
| download | nextcloud-server-b18a7b8d22c2a2e8a1b76c10cf4dc24d97a44198.tar.gz nextcloud-server-b18a7b8d22c2a2e8a1b76c10cf4dc24d97a44198.zip | |
Auto approve/merge also on stable branches
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 860869221c4..e1b21b3a868 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 }} |