Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/mail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNextcloud bot <bot@nextcloud.com>2021-06-29 22:02:33 +0300
committerNextcloud bot <bot@nextcloud.com>2021-06-29 22:02:33 +0300
commitf883fd511dc42e45df230313a82c772040be51a4 (patch)
tree0f974d50273a17c98ad624097f963affe4f1c8f0 /.github
parenteaa11e9175f5cb58fd9a7840b30c6dcbc5b9916d (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.yml22
1 files changed, 15 insertions, 7 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
index 11d69be47..b56a1da47 100644
--- a/.github/workflows/dependabot-approve-merge.yml
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -1,21 +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_target
+
+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.1.0
- if: github.ref == 'refs/heads/master' &&
- (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+ - uses: hmarr/auto-approve-action@v2.0.0
+ 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.4
- if: github.ref == 'refs/heads/master' &&
- (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
+ - uses: ahmadnassri/action-dependabot-auto-merge@v1
+ if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
target: minor
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}