Only upload combined SARIF files when env var is set

github · Mar 25, 2024 · 82b82e5 · 82b82e5
1 parent 3c4b8bc
commit 82b82e5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
diff --git a/lib/analyze-action-post.js.map b/lib/analyze-action-post.js.map
diff --git a/lib/upload-sarif-action-post-helper.js b/lib/upload-sarif-action-post-helper.js
diff --git a/lib/upload-sarif-action-post-helper.js.map b/lib/upload-sarif-action-post-helper.js.map
diff --git a/src/analyze-action-post.ts b/src/analyze-action-post.ts
@@ -7,11 +7,16 @@ import * as core from "@actions/core";
 
 import * as analyzeActionPostHelper from "./analyze-action-post-helper";
 import * as debugArtifacts from "./debug-artifacts";
+import * as uploadSarifActionPostHelper from "./upload-sarif-action-post-helper";
 import { wrapError } from "./util";
 
 async function runWrapper() {
   try {
     await analyzeActionPostHelper.run(debugArtifacts.uploadSarifDebugArtifact);
+
+    // Also run the upload-sarif post action since we're potentially running
+    // the same steps in the analyze action.
+    await uploadSarifActionPostHelper.run(debugArtifacts.uploadDebugArtifacts);
   } catch (error) {
     core.setFailed(
       `analyze post-action step failed: ${wrapError(error).message}`,

diff --git a/src/upload-sarif-action-post-helper.ts b/src/upload-sarif-action-post-helper.ts
@@ -15,7 +15,10 @@ export async function run(
   const tempDir = actionsUtil.getTemporaryDirectory();
 
   // Upload Actions SARIF artifacts for debugging
-  if (core.isDebug()) {
+  if (
+    core.isDebug() &&
+    process.env["CODEQL_ACTION_DEBUG_COMBINED_SARIF"] === "true"
+  ) {
     core.info(
       "Debug mode is on. Uploading available combined SARIF files as Actions debugging artifact...",
     );