From 6dcf9e71fc5b0e76bae132929e810a57d762c67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Sat, 31 Oct 2020 10:42:51 +0100 Subject: [PATCH 1/2] Add dependabot-approve-merge --- .../workflows/dependabot-approve-merge.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/dependabot-approve-merge.yml diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml new file mode 100644 index 000000000..883010351 --- /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: minor + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} From 50a6092bb40e20ffe3c4b1315391274da43d556a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Sat, 31 Oct 2020 10:43:05 +0100 Subject: [PATCH 2/2] Delete dependabot-approve.yml --- .github/workflows/dependabot-approve.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .github/workflows/dependabot-approve.yml diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml deleted file mode 100644 index cc5e6d17c..000000000 --- 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 }}"