Merge pull request #322 from nextcloud/feat/workflow-auto-update
Updating dependabot-approve-merge.yml workflow from template
This commit is contained in:
commit
4026a8dc18
|
|
@ -1,5 +1,15 @@
|
||||||
|
# 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
|
name: Dependabot
|
||||||
on: pull_request_target
|
|
||||||
|
on:
|
||||||
|
pull_request_target:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
- stable*
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
auto-merge:
|
auto-merge:
|
||||||
|
|
@ -7,15 +17,13 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
# Default github action approve
|
# Default github action approve
|
||||||
- uses: hmarr/auto-approve-action@v2.0.0
|
- uses: hmarr/auto-approve-action@v2.0.0
|
||||||
if: github.ref == 'refs/heads/master' &&
|
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
|
||||||
(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
|
|
||||||
with:
|
with:
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
# Nextcloud bot approve and merge request
|
# Nextcloud bot approve and merge request
|
||||||
- uses: ahmadnassri/action-dependabot-auto-merge@v2
|
- uses: ahmadnassri/action-dependabot-auto-merge@v1
|
||||||
if: github.ref == 'refs/heads/master' &&
|
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
|
||||||
(github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]')
|
|
||||||
with:
|
with:
|
||||||
target: minor
|
target: minor
|
||||||
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
|
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue