Fix license printing bug in main.ts
This commit is contained in:
+9
-3
@@ -135,7 +135,7 @@ async function run(): Promise<void> {
|
|||||||
}
|
}
|
||||||
if (config.license_check) {
|
if (config.license_check) {
|
||||||
summary.addLicensesToSummary(invalidLicenseChanges, config)
|
summary.addLicensesToSummary(invalidLicenseChanges, config)
|
||||||
printLicensesBlock(invalidLicenseChanges)
|
printLicensesBlock(invalidLicenseChanges, warnOnly)
|
||||||
}
|
}
|
||||||
if (config.deny_packages || config.deny_groups) {
|
if (config.deny_packages || config.deny_groups) {
|
||||||
summary.addDeniedToSummary(deniedChanges)
|
summary.addDeniedToSummary(deniedChanges)
|
||||||
@@ -215,13 +215,19 @@ function printChangeVulnerabilities(change: Change): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function printLicensesBlock(
|
function printLicensesBlock(
|
||||||
invalidLicenseChanges: Record<string, Changes>
|
invalidLicenseChanges: Record<string, Changes>,
|
||||||
|
warnOnly: boolean
|
||||||
): void {
|
): void {
|
||||||
core.group('Licenses', async () => {
|
core.group('Licenses', async () => {
|
||||||
if (invalidLicenseChanges.forbidden.length > 0) {
|
if (invalidLicenseChanges.forbidden.length > 0) {
|
||||||
core.info('\nThe following dependencies have incompatible licenses:')
|
core.info('\nThe following dependencies have incompatible licenses:')
|
||||||
printLicensesError(invalidLicenseChanges.forbidden)
|
printLicensesError(invalidLicenseChanges.forbidden)
|
||||||
core.setFailed('Dependency review detected incompatible licenses.')
|
const msg = 'Dependency review detected incompatible licenses.'
|
||||||
|
if (warnOnly) {
|
||||||
|
core.warning(msg)
|
||||||
|
} else {
|
||||||
|
core.setFailed(msg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (invalidLicenseChanges.unresolved.length > 0) {
|
if (invalidLicenseChanges.unresolved.length > 0) {
|
||||||
core.warning(
|
core.warning(
|
||||||
|
|||||||
Reference in New Issue
Block a user