build: use static patch value for targetting branches in merge config (#37245)

Due to the desired patch branch (10.0.x) being on a semver version
that is unreleased as stable (there is no 10.0.0 on latest, it is on
next) our logic for determining target patch branches does not work.

This change is a workaround to unblock merging in the repo while a
longer term answer is discovered.

PR Close #37245
This commit is contained in:
Joey Perrott 2020-05-21 10:51:21 -07:00 committed by Matias Niemelä
parent cdb5d07606
commit 93be1f1543
1 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,4 @@
import {MergeConfig} from './dev-infra/pr/merge/config';
import {determineMergeBranches} from './dev-infra/pr/merge/determine-merge-branches';
// The configuration for `ng-dev commit-message` commands.
const commitMessage = {
@ -84,7 +83,8 @@ const github = {
// Configuration for the `ng-dev pr merge` command. The command can be used
// for merging upstream pull requests into branches based on a PR target label.
const merge = () => {
const {patch} = determineMergeBranches(require('./package.json').version, '@angular/core');
// TODO: resume dynamically determining patch branch
const patch = '10.0.x';
const config: MergeConfig = {
githubApiMerge: false,
claSignedLabel: 'cla: yes',