From a064565f9117ca378971764ac0e00094bfa0e6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 4 Sep 2020 12:40:55 +0200 Subject: [PATCH] AUto merge and add compsoer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .github/dependabot.yml | 11 +++++++++++ .github/workflows/dependabot-approve-merge.yml | 16 ++++++++++++++++ .github/workflows/dependabot-approve.yml | 12 ++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/dependabot-approve-merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 28fa13b13..165042438 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,16 @@ version: 2 updates: +- package-ecosystem: composer + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + labels: + - 3. to review + - dependencies - package-ecosystem: npm directory: "/" schedule: diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml new file mode 100644 index 000000000..42db6bf92 --- /dev/null +++ b/.github/workflows/dependabot-approve-merge.yml @@ -0,0 +1,16 @@ +name: Dependabot +on: pull_request + +jobs: + auto-approve: + 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 }}" + + auto-merge: + runs-on: ubuntu-latest + steps: + - uses: ahmadnassri/action-dependabot-auto-merge@v1 diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml index cc5e6d17c..e3b920e7d 100644 --- a/.github/workflows/dependabot-approve.yml +++ b/.github/workflows/dependabot-approve.yml @@ -1,11 +1,19 @@ -name: Dependabot auto approve +name: Dependabot on: pull_request jobs: - build: + auto-approve: 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 }}" + + auto-merge: + runs-on: ubuntu-latest + steps: + - uses: ahmadnassri/action-dependabot-auto-merge@v1 + with: + target: patch + github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}