Merge branch 'main' into aeisenberg/timeout-45-min

This commit is contained in:
Andrew Eisenberg 2022-03-24 08:07:42 -07:00 committed by GitHub
commit 686c3a37f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions

View file

@ -39,8 +39,7 @@ on:
jobs:
CodeQL-Build:
# If you're only analyzing JavaScript or Python, CodeQL runs on ubuntu-latest, windows-latest, and macos-latest.
# If you're analyzing C/C++, C#, Go, or Java, CodeQL runs on ubuntu-latest, windows-2019, and macos-latest.
# CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
runs-on: ubuntu-latest
permissions:

2
lib/actions-util.js generated
View file

@ -550,7 +550,7 @@ async function createStatusReportBase(actionName, status, actionStartedAt, cause
statusReport.runner_os_release = os.release();
}
if (codeQlCliVersion !== undefined) {
statusReport.codeql_cli_version = codeQlCliVersion;
statusReport.codeql_version = codeQlCliVersion;
}
return statusReport;
}

File diff suppressed because one or more lines are too long

View file

@ -611,7 +611,7 @@ export interface StatusReportBase {
/** Action version (x.y.z from package.json). */
action_version: string;
/** CodeQL CLI version (x.y.z from the CLI). */
codeql_cli_version?: string;
codeql_version?: string;
}
export function getActionsStatus(
@ -713,7 +713,7 @@ export async function createStatusReportBase(
statusReport.runner_os_release = os.release();
}
if (codeQlCliVersion !== undefined) {
statusReport.codeql_cli_version = codeQlCliVersion;
statusReport.codeql_version = codeQlCliVersion;
}
return statusReport;