robojerk/codeql-action

Merge remote-tracking branch 'origin/main' into angelapwen/post-init-cleanup

Browse source
This commit is contained in:
Angela P Wen 2022-08-11 15:24:10 +02:00
commit 15608ceae3
6 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/actions-util.js generated
View file

@ -501,11 +501,7 @@ async function createStatusReportBase(actionName, status, actionStartedAt, cause
}
const runnerOs = (0, util_1.getRequiredEnvParam)("RUNNER_OS");
const codeQlCliVersion = (0, util_1.getCachedCodeQlVersion)();
// If running locally then the GITHUB_ACTION_REF cannot be trusted as it may be for the previous action
// See https://github.com/actions/runner/issues/803
const actionRef = isRunningLocalAction()
? undefined
: process.env["GITHUB_ACTION_REF"];
const actionRef = process.env["GITHUB_ACTION_REF"];
const statusReport = {
workflow_run_id: workflowRunID,
workflow_name: workflowName,

2
lib/actions-util.js.map
View file

File diff suppressed because one or more lines are too long

3
lib/upload-lib.js generated
View file

@ -355,7 +355,8 @@ function validateUniqueCategory(sarif) {
const sentinelEnvVar = `CODEQL_UPLOAD_SARIF_${category}`;
if (process.env[sentinelEnvVar]) {
throw new Error("Aborting upload: only one run of the codeql/analyze or codeql/upload-sarif actions is allowed per job per tool/category. " +
"The easiest fix is to specify a unique value for the `category` input. " +
"The easiest fix is to specify a unique value for the `category` input. If .runs[].automationDetails.id is specified " +
"in the sarif file, that will take precedence over your configured `category`. " +
`Category: (${id ? id : "none"}) Tool: (${tool ? tool : "none"})`);
}
core.exportVariable(sentinelEnvVar, sentinelEnvVar);

2
lib/upload-lib.js.map
View file

File diff suppressed because one or more lines are too long

7
src/actions-util.ts
View file

@ -670,12 +670,7 @@ export async function createStatusReportBase(
}
const runnerOs = getRequiredEnvParam("RUNNER_OS");
const codeQlCliVersion = getCachedCodeQlVersion();
// If running locally then the GITHUB_ACTION_REF cannot be trusted as it may be for the previous action
// See https://github.com/actions/runner/issues/803
const actionRef = isRunningLocalAction()
? undefined
: process.env["GITHUB_ACTION_REF"];
const actionRef = process.env["GITHUB_ACTION_REF"];
const statusReport: StatusReportBase = {
workflow_run_id: workflowRunID,

3
src/upload-lib.ts
View file

@ -524,7 +524,8 @@ export function validateUniqueCategory(sarif: SarifFile): void {
if (process.env[sentinelEnvVar]) {
throw new Error(
"Aborting upload: only one run of the codeql/analyze or codeql/upload-sarif actions is allowed per job per tool/category. " +
"The easiest fix is to specify a unique value for the `category` input. " +
"The easiest fix is to specify a unique value for the `category` input. If .runs[].automationDetails.id is specified " +
"in the sarif file, that will take precedence over your configured `category`. " +
`Category: (${id ? id : "none"}) Tool: (${tool ? tool : "none"})`
);
}