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

fix(dev-infra): correct pullapprove global approval regex (#36384) 

PR Close #36384
This commit is contained in:
Joey Perrott 2020-04-01 15:08:25 -07:00 committed by Kara Erickson
parent 6402a9ae2a
commit 36535e9abd
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev-infra/pullapprove/group.ts
View File

@ -5,7 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be * Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {IMinimatch, Minimatch, match} from 'minimatch'; import {IMinimatch, Minimatch} from 'minimatch';
import {PullApproveGroupConfig} from './parse-yaml'; import {PullApproveGroupConfig} from './parse-yaml';
@ -34,7 +34,7 @@ const CONDITION_TYPES = {
INCLUDE_GLOBS: /^contains_any_globs/, INCLUDE_GLOBS: /^contains_any_globs/,
EXCLUDE_GLOBS: /^not contains_any_globs/, EXCLUDE_GLOBS: /^not contains_any_globs/,
ATTR_LENGTH: /^len\(.*\)/, ATTR_LENGTH: /^len\(.*\)/,
GLOBAL_APPROVAL: /^global-(docs-)?approvers not in groups.approved$/, GLOBAL_APPROVAL: /^"global-(docs-)?approvers" not in groups.approved$/,
}; };
/** A PullApprove group to be able to test files against. */ /** A PullApprove group to be able to test files against. */
@ -82,10 +82,7 @@ export class PullApproveGroup {
` - ${condition}` + ` - ${condition}` +
`\n\n` + `\n\n` +
`Known condition regexs:\n` + `Known condition regexs:\n` +
`${Object.entries(CONDITION_TYPES).map(([k, v]) => ` ${k} - $ { `${Object.entries(CONDITION_TYPES).map(([k, v]) => ` ${k} - ${v}`).join('\n')}` +
v
}
`).join('\n')}` +
`\n\n`; `\n\n`;
console.error(errMessage); console.error(errMessage);
process.exit(1); process.exit(1);
@ -95,7 +92,9 @@ export class PullApproveGroup {
} }
/** Retrieve all of the lines which were not able to be parsed. */ /** Retrieve all of the lines which were not able to be parsed. */
getBadLines(): string[] { return this.misconfiguredLines; } getBadLines(): string[] {
return this.misconfiguredLines;
}
/** Retrieve the results for the Group, all matched and unmatched conditions. */ /** Retrieve the results for the Group, all matched and unmatched conditions. */
getResults(): PullApproveGroupResult { getResults(): PullApproveGroupResult {