From 992ed5b572e9438cc4b45ea939b8931905ee46d6 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Tue, 28 Mar 2023 16:56:35 +0800 Subject: [PATCH] Update dependabot and renovate to target main branch (#14614) --- .github/dependabot.yml | 2 +- .github/renovate.json5 | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index be949de20..6cc794803 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,4 +8,4 @@ updates: time: "01:00" labels: - scope:dependency - target-branch: "next" + target-branch: "main" diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 74f9dfb2f..193a006ba 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,7 +1,7 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", labels: ["dependency"], - baseBranches: ["next"], + baseBranches: ["main"], schedule: ["after 01:00 on sunday"], postUpdateOptions: ["yarnDedupeHighest"], packageRules: [ @@ -18,6 +18,10 @@ matchPackagePrefixes: ["@typescript-eslint/"], groupName: "typescript-eslint", }, + { + matchPackagePrefixes: ["@glimmer/"], + groupName: "glimmer", + }, { branchPrefix: "renovate/website/", matchPaths: ["website/package.json"], @@ -33,4 +37,8 @@ labels: ["dependency:tools"], }, ], + ignoreDeps: [ + // It's a dependency of `remark-parse`, use same version to reduce size + "collapse-white-space", + ], }