From 67c7cb0ea1972456e1f7e90e7a355c5643ba3c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 29 Mar 2022 15:13:20 +0200 Subject: [PATCH] Use renovate to do the missing updates --- .github/dependabot.yaml | 8 ++--- .github/renovate.json5 | 33 ++++++++++++++++++++ .github/workflows/dependabot-auto-merge.yaml | 18 +++++------ 3 files changed, 44 insertions(+), 15 deletions(-) create mode 100644 .github/renovate.json5 diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 830917df69..633117d252 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -5,26 +5,26 @@ updates: - package-ecosystem: gradle directory: '/' schedule: - interval: daily + interval: monthly ignore: - dependency-name: none - package-ecosystem: pip directory: '/ci' schedule: - interval: daily + interval: monthly ignore: - dependency-name: none - package-ecosystem: docker directory: '/' schedule: - interval: daily + interval: monthly ignore: - dependency-name: none - package-ecosystem: docker directory: '/core' schedule: - interval: daily + interval: monthly ignore: - dependency-name: none diff --git a/.github/renovate.json5 b/.github/renovate.json5 new file mode 100644 index 0000000000..fcb7957e53 --- /dev/null +++ b/.github/renovate.json5 @@ -0,0 +1,33 @@ +{ + "extends": ["config:base", "schedule:earlyMondays"], + "baseBranches": ["master", "3.20", "3.27", "3.28", "3.29"], + "packageRules": [ + /** Automerge the patch, the minor and the dev dependency */ + { + "matchBaseBranches": ["master"], + "matchUpdateTypes": ["minor", "patch"], + "automerge": true + }, + { + "matchDepTypes": ["devDependencies"], + "automerge": true + }, + /** Group the patch and the minor */ + { + "matchUpdateTypes": ["patch"], + "groupName": "all patch versions", + "automerge": true + }, + { + "matchUpdateTypes": ["minor"], + "groupName": "all minor versions", + "automerge": true + }, + /** Accept only the patch on the stabilization branches */ + { + "branchPrefix": ["3."], + "matchUpdateTypes": ["major", "minor", "pin", "digest", "lockFileMaintenance", "rollback", "bump"], + "enabled": false + } + ] +} diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 07897349aa..aa4cf491a2 100644 --- a/.github/workflows/dependabot-auto-merge.yaml +++ b/.github/workflows/dependabot-auto-merge.yaml @@ -1,21 +1,17 @@ ---- -name: Auto merge Dependabot updates +name: Auto reviews updates -on: - workflow_run: - workflows: - - Continuous integration - types: - - completed +on: pull_request jobs: auto-merge: - name: Auto merge Dependabot updates + name: Auto reviews updates runs-on: ubuntu-20.04 timeout-minutes: 5 steps: - - name: Auto merge - uses: ridedott/dependabot-auto-merge-action@master + - name: Auto reviews updates + uses: golfzaptw/action-auto-reviews-from-branches@master with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BRANCHES: master + AUTHOR: dependabot[bot],renovatebot