diff options
| author | Georg Ehrke <georgehrke@users.noreply.github.com> | 2020-09-07 15:50:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 15:50:36 +0300 |
| commit | e4ba4d57c65a7089dd8b7165cf688751ae753c0d (patch) | |
| tree | 7483788f7b451921cb1f3ba1e05b29be3ba6ff23 | |
| parent | 9f4e2fe361c82aa69025211e4638fdc8196e3b3f (diff) | |
| parent | bd4181cee44eb8186f268455b602c829274a2891 (diff) | |
Merge pull request #510 from nextcloud/bugfix/noid/automerge_patch
Automerge patch updates of dependencies
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 19 | ||||
| -rw-r--r-- | .github/workflows/dependabot-approve.yml | 11 |
2 files changed, 19 insertions, 11 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml new file mode 100644 index 0000000..201d7f5 --- /dev/null +++ b/.github/workflows/dependabot-approve-merge.yml @@ -0,0 +1,19 @@ +name: Dependabot +on: pull_request + +jobs: + auto-merge: + runs-on: ubuntu-latest + steps: + # Default github action approve + - uses: hmarr/auto-approve-action@v2.0.0 + 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@v1 + if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' + with: + target: patch + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml deleted file mode 100644 index cc5e6d1..0000000 --- a/.github/workflows/dependabot-approve.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Dependabot auto approve -on: pull_request - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: hmarr/auto-approve-action@v2.0.0 - if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" |