diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-03-28 21:40:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-28 21:40:08 +0300 |
| commit | 89eb8a3b05917b93a543089d98eaa1342a223806 (patch) | |
| tree | b57e82921e010e97a4cf68353734145e437888c8 /.github | |
| parent | 93553e9cf698138bf7558fd85be441e5be56d364 (diff) | |
Update dependabot-approve-merge.yml
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 ca51c72..8608692 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -1,19 +1,21 @@ name: Dependabot -on: pull_request +on: pull_request_target jobs: auto-merge: runs-on: ubuntu-latest steps: # Default github action approve - - uses: hmarr/auto-approve-action@v2 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + - uses: hmarr/auto-approve-action@v2.0.0 + if: github.ref == 'refs/heads/master' && + (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@v1 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + - uses: ahmadnassri/action-dependabot-auto-merge@v2 + if: github.ref == 'refs/heads/master' && + (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') with: target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |