From 9ff5289f589d1f2eef437b7095717f5970987a82 Mon Sep 17 00:00:00 2001 From: "Cuong M. Tran" Date: Tue, 4 Jun 2024 14:39:51 +0700 Subject: [PATCH] Update renovate/dependabot to rebase on develop branch by default --- .github/dependabot.yml | 1 + renovate.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a3ea99489..78077b3e3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,6 +6,7 @@ version: 2 updates: - package-ecosystem: "github-actions" + target-branch: "develop" directory: "/" # Location of package manifests schedule: interval: "weekly" diff --git a/renovate.json b/renovate.json index 41116c492..3184a353f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,9 +1,9 @@ { - "baseBranches": ["master"], + "baseBranches": ["develop"], "rebaseWhen": "conflicted", "labels": ["Dependencies"], "extends": [ - ["config:best-practices"], + "config:best-practices", "github>mihonapp/mihon//.github/renovate.json5" ], "includeForks": true