Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f3a0a015 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #330 from nextcloud/autoMerge 

fix auto merge, try 2
parents 91b176cd f12cfee5

.github/workflows/autoApproveDependabot.yml

+7 −5
Original line number Diff line number Diff line 
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 }}