diff options
| author | René Gieling <github@dartcafe.de> | 2021-05-05 09:46:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 09:46:20 +0300 |
| commit | 016223c8527ed061a4dd78da657a7b89bc00bd9a (patch) | |
| tree | 2f08fdf91a37d3f13c685bed168ac55f91cc2330 /.github | |
| parent | 2629c7b035a91ab0ae2fbb9b7a0329eeb147735e (diff) | |
Update auto-merge.yml
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/auto-merge.yml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 254cbbf6..0d014b92 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -7,8 +7,17 @@ jobs: auto-merge: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + # Default github action approve + - uses: hmarr/auto-approve-action@v2.0.0 + if: github.ref == 'refs/heads/master' && + (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.ref == 'refs/heads/master' && + (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') with: target: minor github-token: ${{ secrets.AUTO_MERGE }} |