diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-01-22 14:14:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 14:14:34 +0300 |
| commit | 0914a94b9627e24eedab697d47535b03c20a4817 (patch) | |
| tree | f8e8b84ec45336529323e2d8ed4ae2a151515351 | |
| parent | a4cb7c7046f0f2cfa6dc1dc485c2b7c5daa9b513 (diff) | |
| parent | 68baf287abf18bc10edcdba533b6fd4f1ac55183 (diff) | |
Merge pull request #84 from nextcloud/feat/workflow-auto-update-dependabot-approve-merge.yml
Updating dependabot-approve-merge.yml workflow from template
| -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 6c5d737..19a1311 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 }} |