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

github · Mar 24, 2022 · 686c3a3 · 686c3a3
2 parents 5d72058 + c9973ef
commit 686c3a3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -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:

diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -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;