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

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,

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"})`
         );
       }