Skip to content

Commit 0012121

Browse files
authored
build: set master as branch for minor label (#19913)
Updates the hard-coded branch logic so that minor label merges into `master`. We continue using our hardcoded valus as we have not finalized the branching and labeling yet.
1 parent 74f622b commit 0012121

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.ng-dev/merge.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ 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-
let {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
1312

1413
// 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-
}
14+
// let {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
15+
const patch = '10.0.x';
16+
const minor = 'master';
1917

2018
return {
2119
// By default, the merge script merges locally with `git cherry-pick` and autosquash.

0 commit comments

Comments
 (0)