honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update ng-dev merge config to reflect new label updates (#38620) 

Update the ng-dev merge configuration to reflect the new label updates

PR Close #38620
This commit is contained in:
Joey Perrott 2020-08-27 16:30:59 -07:00
parent 9613660fee
commit 2dd29fbae7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ng-dev/merge.ts
View File

@ -10,8 +10,8 @@ export const merge: DevInfraMergeConfig['merge'] = async api => {
return { return {
githubApiMerge: false, githubApiMerge: false,
claSignedLabel: 'cla: yes', claSignedLabel: 'cla: yes',
mergeReadyLabel: /^PR action: merge(-assistance)?/, mergeReadyLabel: /^action: merge(-assistance)?/,
caretakerNoteLabel: 'PR action: merge-assistance', caretakerNoteLabel: 'action: merge-assistance',
commitMessageFixupLabel: 'commit message fixup', commitMessageFixupLabel: 'commit message fixup',
labels: await getDefaultTargetLabelConfiguration(api, github, '@angular/core'), labels: await getDefaultTargetLabelConfiguration(api, github, '@angular/core'),
requiredBaseCommits: { requiredBaseCommits: {
@ -19,7 +19,7 @@ export const merge: DevInfraMergeConfig['merge'] = async api => {
// on top of the latest commit message validation fix. // on top of the latest commit message validation fix.
// These SHAs are the commits that update the required license text in the header. // These SHAs are the commits that update the required license text in the header.
'master': '5aeb9a4124922d8ac08eb73b8f322905a32b0b3a', 'master': '5aeb9a4124922d8ac08eb73b8f322905a32b0b3a',
'10.0.x': '27b95ba64a5d99757f4042073fd1860e20e3ed24' '10.0.x': '27b95ba64a5d99757f4042073fd1860e20e3ed24',
}, },
}; };
}; };