Skip to content

build: update merge script temporarily to merge into rc branch #19617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2020
Merged

build: update merge script temporarily to merge into rc branch #19617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .ng-dev/merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ 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.
const {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
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';
}

return {
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
Expand All @@ -32,7 +38,8 @@ export const merge = (): MergeConfig => {
},
{
pattern: 'target: minor',
branches: ['master', minor],
// TODO: Clean this up after the labels/branching has been finalized.
branches: minor === 'master' ? ['master'] : ['master', minor],
},
{
pattern: 'target: major',
Expand Down