summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/dependabot-approve-merge.yml22
1 files changed, 16 insertions, 6 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
index 201d7f5ebf2..c8d69da5819 100644
--- a/.github/workflows/dependabot-approve-merge.yml
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -1,19 +1,29 @@
+# This workflow is provided via the organization template repository
+#
+# https://github.com/nextcloud/.github
+# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+
name: Dependabot
-on: pull_request
+
+on:
+ pull_request_target:
+ branches:
+ - master
+ - stable*
jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
# Default github action approve
- - uses: hmarr/auto-approve-action@v2.0.0
- if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+ - uses: hmarr/auto-approve-action@v2
+ if: github.actor == 'dependabot[bot]'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# Nextcloud bot approve and merge request
- - uses: ahmadnassri/action-dependabot-auto-merge@v1
- if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+ - uses: ahmadnassri/action-dependabot-auto-merge@v2
+ if: github.actor == 'dependabot[bot]'
with:
- target: patch
+ target: minor
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}