summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorNextcloud bot <bot@nextcloud.com>2022-01-22 09:29:28 +0000
committerNextcloud bot <bot@nextcloud.com>2022-01-22 09:29:28 +0000
commit56a93d899628f335ee3e77f09c21dd666967543f (patch)
tree5a1b5bbdbb8120c2bbb8e9604eeda6a545b551c2 /.github
parente876156f42a941e8830662b5e79eab21936b833f (diff)
Updating dependabot-approve-merge.yml workflow from template
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/dependabot-approve-merge.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
index 6c5d7373..19a1311b 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 }}