diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-06-30 08:44:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 08:44:46 +0300 |
| commit | 506265a984d10f5dd9f991f8f05a3f53185bc095 (patch) | |
| tree | d6a8307646eb6d5a3228afc646327f13ce1e5c4f | |
| parent | 9124c69cf6ca7cf7551112f19a9e5431f9cb6f13 (diff) | |
| parent | b4cb5e2cff85f58d198a3a9efcf5c2cbca86bfef (diff) | |
Merge pull request #27717 from nextcloud/feat/workflow-auto-update
Updating dependabot-approve-merge.yml workflow from template
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index e1b21b3a868..b56a1da4791 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -1,4 +1,10 @@ +# 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: branches: @@ -11,13 +17,13 @@ jobs: steps: # Default github action approve - uses: hmarr/auto-approve-action@v2.0.0 - if: (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.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 }} |