diff options
author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2022-09-29 13:36:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-29 13:36:20 +0200 |
commit | 020811c10b221bbaa1b0b97c5a9f6383935cc916 (patch) | |
tree | 1cedfc542847bcdc9b30d51d3bc900d5103ef47f /.github | |
parent | 99a4acb506c440dc0e997b3abd3f129456079eda (diff) | |
parent | cb94b5dc3d640249e32a50c6e4347bba461c81b0 (diff) |
Merge pull request #2620 from nextcloud/feat/workflow-auto-update-dependabot-approve-merge.yml
Updating dependabot-approve-merge.yml workflow from template
Diffstat (limited to '.github')
-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 53ccf2ca..0d6e3434 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 }} |