Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ro-optional-full-result
Browse files Browse the repository at this point in the history
  • Loading branch information
rottebds committed Feb 16, 2022
2 parents 6760926 + 04fe703 commit a615208
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,10 @@ function runWithPolicyCheck(blackduckPolicyCheck) {
blackduckPolicyCheck.cancelCheck();
return;
}
else if (detectExitCode > 0 && detectExitCode != exit_codes_1.POLICY_SEVERITY) {
(0, core_1.setFailed)(`Detect failed with exit code: ${detectExitCode}. Check the logs for more information.`);
return;
}
(0, core_1.info)(`${detect_manager_1.TOOL_NAME} executed successfully.`);
let hasPolicyViolations = false;
if (inputs_1.SCAN_MODE === 'RAPID') {
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ export async function runWithPolicyCheck(blackduckPolicyCheck: GitHubCheck): Pro
debug(`Could not determine ${TOOL_NAME} exit code. Canceling policy check.`)
blackduckPolicyCheck.cancelCheck()
return
} else if (detectExitCode > 0 && detectExitCode != POLICY_SEVERITY) {
setFailed(`Detect failed with exit code: ${detectExitCode}. Check the logs for more information.`)
return
}

info(`${TOOL_NAME} executed successfully.`)
Expand Down

0 comments on commit a615208

Please sign in to comment.