Skip to content

Commit f92e0df

Browse files
authored
build: update merge script temporarily to merge into rc branch (#19617)
Updates the merge script temporarily so that `target: patch` PRs are merged into the RC branch. We are currently revisiting labeling/branching, and once this is finalized, we can clean this up. For now though, we want to not put the burden of manually cherry-picking onto the caretaker.
1 parent 5244a9f commit f92e0df

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

.ng-dev/merge.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ export const merge = (): MergeConfig => {
99
const currentVersion = require('../package.json').version;
1010
// We use the `@angular/cdk` as source of truth for the latest published version in NPM.
1111
// Any package from the monorepo could technically work and result in the same version.
12-
const {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
12+
let {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
13+
14+
// TODO(devversion) Clean this up once the label/branching has been finalized.
15+
if (currentVersion.startsWith('10.0.0-rc')) {
16+
patch = '10.0.x';
17+
minor = 'master';
18+
}
1319

1420
return {
1521
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
@@ -32,7 +38,8 @@ export const merge = (): MergeConfig => {
3238
},
3339
{
3440
pattern: 'target: minor',
35-
branches: ['master', minor],
41+
// TODO: Clean this up after the labels/branching has been finalized.
42+
branches: minor === 'master' ? ['master'] : ['master', minor],
3643
},
3744
{
3845
pattern: 'target: major',

0 commit comments

Comments
 (0)