diff options
| author | tobiasKaminsky <tobias@kaminsky.me> | 2021-04-01 15:04:44 +0300 |
|---|---|---|
| committer | tobiasKaminsky <tobias@kaminsky.me> | 2021-04-01 15:04:44 +0300 |
| commit | f12cfee5e4d1ce80e9d95475dce288b4ab5335f4 (patch) | |
| tree | d6c58e2f64f4ac674e28c9af140bd97d27334b9c /.github | |
| parent | df3286627d9f2cf7ce8fc75e8ec5e967bc639e13 (diff) | |
fix auto merge, try 2
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/autoApproveDependabot.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/autoApproveDependabot.yml b/.github/workflows/autoApproveDependabot.yml index 201d7f5..6079f5f 100644 --- a/.github/workflows/autoApproveDependabot.yml +++ b/.github/workflows/autoApproveDependabot.yml @@ -1,5 +1,5 @@ name: Dependabot -on: pull_request +on: pull_request_target jobs: auto-merge: @@ -7,13 +7,15 @@ 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.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@v1 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + - uses: ahmadnassri/action-dependabot-auto-merge@v2 + if: github.ref == 'refs/heads/master' && + (github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') with: - target: patch + target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |