Always wait for processing when uploading a failed SARIF file
This commit is contained in:
parent
e628ee0ae1
commit
00a3c456fb
7 changed files with 10 additions and 54 deletions
|
|
@ -13,7 +13,6 @@ import {
|
|||
getCategoryInputOrThrow,
|
||||
getCheckoutPathInputOrThrow,
|
||||
getUploadInputOrThrow,
|
||||
getWaitForProcessingInputOrThrow,
|
||||
getWorkflow,
|
||||
} from "./workflow";
|
||||
|
||||
|
|
@ -53,8 +52,6 @@ async function uploadFailedSarif(
|
|||
}
|
||||
const category = getCategoryInputOrThrow(workflow, jobName, matrix);
|
||||
const checkoutPath = getCheckoutPathInputOrThrow(workflow, jobName, matrix);
|
||||
const waitForProcessing =
|
||||
getWaitForProcessingInputOrThrow(workflow, jobName, matrix) === "true";
|
||||
|
||||
const sarifFile = "../codeql-failed-run.sarif";
|
||||
await codeql.diagnosticsExport(sarifFile, category);
|
||||
|
|
@ -66,14 +63,12 @@ async function uploadFailedSarif(
|
|||
category,
|
||||
logger
|
||||
);
|
||||
if (waitForProcessing) {
|
||||
await uploadLib.waitForProcessing(
|
||||
repositoryNwo,
|
||||
uploadResult.sarifID,
|
||||
logger,
|
||||
{ isUnsuccessfulExecution: true }
|
||||
);
|
||||
}
|
||||
await uploadLib.waitForProcessing(
|
||||
repositoryNwo,
|
||||
uploadResult.sarifID,
|
||||
logger,
|
||||
{ isUnsuccessfulExecution: true }
|
||||
);
|
||||
}
|
||||
|
||||
export async function run(
|
||||
|
|
|
|||
|
|
@ -410,29 +410,6 @@ export function getUploadInputOrThrow(
|
|||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes a best effort attempt to retrieve the wait-for-processing input for the
|
||||
* particular job, given a set of matrix variables.
|
||||
*
|
||||
* @returns the wait-for-processing input
|
||||
* @throws an error if the wait-for-processing input could not be determined
|
||||
*/
|
||||
export function getWaitForProcessingInputOrThrow(
|
||||
workflow: Workflow,
|
||||
jobName: string,
|
||||
matrixVars: { [key: string]: string } | undefined
|
||||
): string {
|
||||
return (
|
||||
getInputOrThrow(
|
||||
workflow,
|
||||
jobName,
|
||||
"github/codeql-action/analyze",
|
||||
"wait-for-processing",
|
||||
matrixVars
|
||||
) || "true" // if unspecified, wait-for-processing defaults to true
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes a best effort attempt to retrieve the checkout_path input for the
|
||||
* particular job, given a set of matrix variables.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue