diff options
| author | max-nextcloud <max@nextcloud.com> | 2022-01-25 02:22:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 02:22:26 +0300 |
| commit | 186b2d55b89abe4b25e302e1229a942e6011b2be (patch) | |
| tree | 90bdd1a1a4bd61dc282df4b65af6872797028262 | |
| parent | ebce109bb939b03602f0248db156b349b5e1049a (diff) | |
| parent | 86eaf9765fa94a0a0a4dc192f51eab6845753b80 (diff) | |
Merge pull request #2128 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 6c5d73739..19a1311b4 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 }} |