From 91e463ff007848f88786954d7ccdef2098fe6680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 7 Sep 2020 11:43:49 +0200 Subject: [PATCH 1/2] Move to automated dependabot merging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .github/dependabot.yml | 92 +++++++++++++++++++ .../workflows/dependabot-approve-merge.yml | 19 ++++ 2 files changed, 111 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/dependabot-approve-merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000000..ab959ecac6e41 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,92 @@ +version: 2 +updates: +# Linting and coding style +- package-ecosystem: composer + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + labels: + - 3. to review + - "feature: dependencies" + +# Main master npm +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + labels: + - 3. to review + - "feature: dependencies" + +# Testing master npm +- package-ecosystem: npm + directory: "/build" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + labels: + - 3. to review + - "feature: dependencies" + +# Testing master composer +- package-ecosystem: composer + directory: "/build/integration" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + labels: + - 3. to review + - "feature: dependencies" + + +# Main stableXX npm +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + # Only allow updates to the lockfile + versioning-strategy: lockfile-only + target-branch: + - stable19 + - stable18 + - stable17 + labels: + - 3. to review + - "feature: dependencies" + +# Testing StableXX composer +- package-ecosystem: composer + directory: "/build/integration" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + # Only allow updates to the lockfile + versioning-strategy: lockfile-only + target-branch: + - stable19 + - stable18 + - stable17 + labels: + - 3. to review + - "feature: dependencies" diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml new file mode 100644 index 0000000000000..201d7f5ebf2a8 --- /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 }} From d939f2fa5a01f5c8879e049b27d83ab97fcd0992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 8 Sep 2020 08:32:14 +0200 Subject: [PATCH 2/2] Split target-branch between stablexx branches until it supports Arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .github/dependabot.yml | 66 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ab959ecac6e41..1e7ef6843a020 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -64,10 +64,35 @@ updates: open-pull-requests-limit: 10 # Only allow updates to the lockfile versioning-strategy: lockfile-only - target-branch: - - stable19 - - stable18 - - stable17 + target-branch: stable19 + labels: + - 3. to review + - "feature: dependencies" +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + # Only allow updates to the lockfile + versioning-strategy: lockfile-only + target-branch: stable18 + labels: + - 3. to review + - "feature: dependencies" +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + # Only allow updates to the lockfile + versioning-strategy: lockfile-only + target-branch: stable17 labels: - 3. to review - "feature: dependencies" @@ -83,10 +108,35 @@ updates: open-pull-requests-limit: 10 # Only allow updates to the lockfile versioning-strategy: lockfile-only - target-branch: - - stable19 - - stable18 - - stable17 + target-branch: stable19 + labels: + - 3. to review + - "feature: dependencies" +- package-ecosystem: composer + directory: "/build/integration" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + # Only allow updates to the lockfile + versioning-strategy: lockfile-only + target-branch: stable18 + labels: + - 3. to review + - "feature: dependencies" +- package-ecosystem: composer + directory: "/build/integration" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + open-pull-requests-limit: 10 + # Only allow updates to the lockfile + versioning-strategy: lockfile-only + target-branch: stable17 labels: - 3. to review - "feature: dependencies"