From 3642707145f3042df12c364016e76f99505b43fa Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Thu, 28 May 2020 13:34:08 -0700 Subject: [PATCH] build: use static patch value for targetting branches in merge config (#37299) 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 #37299 --- .ng-dev/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ng-dev/config.ts b/.ng-dev/config.ts index 141944d22e..bfcf512903 100644 --- a/.ng-dev/config.ts +++ b/.ng-dev/config.ts @@ -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',