Skip to content

Commit

Permalink
build: set master as branch for minor label (angular#19913)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
devversion authored Jul 8, 2020
1 parent 74f622b commit 0012121
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .ng-dev/merge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ export const merge = (): MergeConfig => {
const currentVersion = require('../package.json').version;
// We use the `@angular/cdk` as source of truth for the latest published version in NPM.
// Any package from the monorepo could technically work and result in the same version.
let {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');

// TODO(devversion) Clean this up once the label/branching has been finalized.
if (currentVersion.startsWith('10.0.0-rc')) {
patch = '10.0.x';
minor = 'master';
}
// let {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
const patch = '10.0.x';
const minor = 'master';

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

0 comments on commit 0012121

Please sign in to comment.