summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2023-02-03 17:47:18 +0100
committerJoas Schilling <coding@schilljs.com>2023-02-06 11:03:38 +0100
commitb4f28c84a14d0682598c9acd3b90112611d7df2e (patch)
tree62bc964b58c2586ffe917283c3ae9d3ce2076fc0
parentf4d965a4555d76d7de5550a6f579cc23bbc1cd48 (diff)
chore(deps): Add auto approval and merge for dependabot
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
-rw-r--r--.github/workflows/dependabot-approve-merge.yml (renamed from .github/workflows/dependabot-approve.yml)10
1 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve-merge.yml
index 7f6b10ab7..9951547f7 100644
--- a/.github/workflows/dependabot-approve.yml
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -20,7 +20,7 @@ concurrency:
cancel-in-progress: true
jobs:
- auto-approve:
+ auto-approve-merge:
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest
permissions:
@@ -28,7 +28,13 @@ jobs:
pull-requests: write
steps:
- # GitHub actions bot approve
+ # Github actions bot approve
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
+
+ # Nextcloud bot approve and merge request
+ - uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
+ with:
+ target: minor
+ github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}