diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-05-28 12:25:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 12:25:03 +0200 |
| commit | 018e18bf8a950b50713a69d6114a803bbdcf23b1 (patch) | |
| tree | defcf49a5333b90a842c95c04a691157c77423a7 /.github/workflows | |
| parent | fb7899135e4ac73ef4ad8d547e669207ad096369 (diff) | |
| download | nextcloud-server-018e18bf8a950b50713a69d6114a803bbdcf23b1.tar.gz nextcloud-server-018e18bf8a950b50713a69d6114a803bbdcf23b1.zip | |
Fix dependabot config
Diffstat (limited to '.github/workflows')
| -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 201d7f5ebf2..860869221c4 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -1,5 +1,5 @@ name: Dependabot -on: pull_request +on: pull_request_target jobs: auto-merge: @@ -7,13 +7,15 @@ jobs: steps: # Default github action approve - uses: hmarr/auto-approve-action@v2.0.0 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + 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: patch + target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |