Skip to content

Commit

Permalink
Merge pull request #875 from nextcloud/backport/874/stable20
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Aug 30, 2021
2 parents b864654 + 12e4052 commit cf8bf2e
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions .github/workflows/dependabot-approve-merge.yml
Original file line number Diff line number Diff line change
@@ -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:
auto-approve-merge:
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest

steps:
# Default github action approve
- uses: hmarr/[email protected]
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
# Github actions bot approve
- uses: hmarr/auto-approve-action@v2
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
with:
target: minor
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}

0 comments on commit cf8bf2e

Please sign in to comment.