diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-06-30 07:14:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 07:14:36 +0200 |
| commit | 1900c3e10fe17a1261e7e8663df69a7c8a5a11d8 (patch) | |
| tree | 28b8039efaf1340cb5899530dec81a778d80e302 | |
| parent | a23564db769125c0411d92c8132048ba10c814ba (diff) | |
| parent | 1aaa64d102ddd5cd4aac2dd0a3cf0f3e7b2807e3 (diff) | |
Merge pull request #2318 from nextcloud/feat/workflow-auto-update
Updating dependabot-approve-merge.yml workflow from template
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 86086922..b56a1da4 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -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 -on: pull_request_target + +on: + pull_request_target: + branches: + - master + - stable* jobs: auto-merge: @@ -7,15 +17,13 @@ jobs: steps: # 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]') + 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 - 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 }} |