diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-07-27 08:16:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 08:16:41 +0200 |
| commit | 39931cab94512fb3f9eece0f03f66fc1b88a933b (patch) | |
| tree | f443e3a1d67c30d8d6198cba887ec7c74a124eab | |
| parent | 5efbdda151a47d38847bf914d3eeefed7349bea0 (diff) | |
| download | nextcloud-server-39931cab94512fb3f9eece0f03f66fc1b88a933b.tar.gz nextcloud-server-39931cab94512fb3f9eece0f03f66fc1b88a933b.zip | |
Update dependabot-approve-merge.yml
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 6c5d73739ce..19a1311b4e7 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -7,23 +7,23 @@ name: Dependabot on: pull_request_target: - branches: + branches: - master - stable* jobs: - auto-merge: + auto-approve-merge: + if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest + steps: - # Default github action approve + # Github actions bot approve - uses: hmarr/auto-approve-action@v2 - 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.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' with: target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |