diff --git a/src/filter.ts b/src/filter.ts index 37d832e..ba80ef8 100644 --- a/src/filter.ts +++ b/src/filter.ts @@ -1,4 +1,4 @@ -import {Changes, Severity, SEVERITIES, Scope, SCOPES} from './schemas' +import {Changes, Severity, SEVERITIES, Scope} from './schemas' export function filterChangesBySeverity( severity: Severity, @@ -39,7 +39,7 @@ export function filterChangesByScopes( changes: Changes ): Changes { const filteredChanges = changes.filter(change => { - if (scopes.indexOf(change.scope) > -1) { + if (scopes.includes(change.scope)) { return true } }) diff --git a/src/main.ts b/src/main.ts index be1e156..e616841 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,9 +3,9 @@ import * as dependencyGraph from './dependency-graph' import * as github from '@actions/github' import styles from 'ansi-styles' import {RequestError} from '@octokit/request-error' -import {Change, Severity} from './schemas' +import {Change, Severity, Scope} from './schemas' import {readConfig} from '../src/config' -import {filterChangesBySeverity} from '../src/filter' +import {filterChangesBySeverity, filterChangesByScopes} from '../src/filter' import {getDeniedLicenseChanges} from './licenses' import * as summary from './summary' import {getRefs} from './git-refs' @@ -30,9 +30,13 @@ async function run(): Promise { deny: config.deny_licenses } + const scopes = config.fail_on_scopes + + const scopedChanges = filterChangesByScopes(scopes as Scope[], changes) + const addedChanges = filterChangesBySeverity( minSeverity as Severity, - changes + scopedChanges ).filter( change => change.change_type === 'added' && @@ -41,7 +45,7 @@ async function run(): Promise { ) const [licenseErrors, unknownLicenses] = getDeniedLicenseChanges( - changes, + scopedChanges, licenses )