diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-03-17 17:32:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 17:32:22 +0100 |
| commit | cc308c791fe0df4d9f3279324c6a40dcc795280e (patch) | |
| tree | 8631f0c81f5a81ab232c4b3e2cd4eeda209b84f3 /.github | |
| parent | c84853bbc85a6eaa0b9ec4b47d0e24125984aabc (diff) | |
Fix dependabot
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 88301035..86086922 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: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |