diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 860869221c4..c8d69da5819 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -1,21 +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_target + +on: + pull_request_target: + branches: + - master + - stable* jobs: auto-merge: runs-on: ubuntu-latest 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]') + - uses: hmarr/auto-approve-action@v2 + if: github.actor == 'dependabot[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]') + if: github.actor == 'dependabot[bot]' with: target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}