diff --git a/.backportrc.json b/.backportrc.json index 8f458343c51af..3f1d639e9a480 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -3,6 +3,7 @@ "targetBranchChoices": [ { "name": "master", "checked": true }, { "name": "7.x", "checked": true }, + "7.9", "7.8", "7.7", "7.6", @@ -26,7 +27,7 @@ "targetPRLabels": ["backport"], "branchLabelMapping": { "^v8.0.0$": "master", - "^v7.9.0$": "7.x", + "^v7.10.0$": "7.x", "^v(\\d+).(\\d+).\\d+$": "$1.$2" } } diff --git a/renovate.json5 b/renovate.json5 index 1ba6dc0ff7e1b..6424894622c9f 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -25,7 +25,7 @@ 'Team:Operations', 'renovate', 'v8.0.0', - 'v7.9.0', + 'v7.10.0', ], major: { labels: [ @@ -33,7 +33,7 @@ 'Team:Operations', 'renovate', 'v8.0.0', - 'v7.9.0', + 'v7.10.0', 'renovate:major', ], }, @@ -254,7 +254,7 @@ 'Team:Operations', 'renovate', 'v8.0.0', - 'v7.9.0', + 'v7.10.0', ':ml', ], }, diff --git a/src/dev/renovate/config.ts b/src/dev/renovate/config.ts index d868f0a89b98c..c9688fc0ae0bd 100644 --- a/src/dev/renovate/config.ts +++ b/src/dev/renovate/config.ts @@ -21,7 +21,7 @@ import { RENOVATE_PACKAGE_GROUPS } from './package_groups'; import { PACKAGE_GLOBS } from './package_globs'; import { wordRegExp, maybeFlatMap, maybeMap, getTypePackageName } from './utils'; -const DEFAULT_LABELS = ['release_note:skip', 'Team:Operations', 'renovate', 'v8.0.0', 'v7.9.0']; +const DEFAULT_LABELS = ['release_note:skip', 'Team:Operations', 'renovate', 'v8.0.0', 'v7.10.0']; export const RENOVATE_CONFIG = { extends: ['config:base'],