diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2022-06-13 18:13:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 18:13:44 +0300 |
| commit | f1f4a287ce3b2074759ef959f42af1639ab4daa6 (patch) | |
| tree | cf10eaa5ae0b9d383a5dc36a73c7e27afeb4ce38 | |
| parent | 610566e6a16fc195c9df849f2307c067852acccb (diff) | |
| parent | 793b0ceb7604293a7508d21bb2efa999f0400387 (diff) | |
Merge pull request #5991 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 | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 53ccf2ca9..0d6e34340 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -7,23 +7,30 @@ name: Dependabot on: pull_request_target: - branches: + branches: - main + - master - stable* +permissions: + contents: read + jobs: - auto-merge: + auto-approve-merge: + if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest + permissions: + # for hmarr/auto-approve-action to approve PRs + pull-requests: write + 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 }} |