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

…cleanup
github · Aug 11, 2022 · 15608ce · 15608ce
2 parents 6fdaff6 + a6d0901
commit 15608ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
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/lib/upload-lib.js b/lib/upload-lib.js
diff --git a/lib/upload-lib.js.map b/lib/upload-lib.js.map
diff --git a/src/actions-util.ts b/src/actions-util.ts
@@ -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,

diff --git a/src/upload-lib.ts b/src/upload-lib.ts
@@ -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"})`
         );
       }