Emit log message, capture non-PR runs

github · Jan 16, 2024 · 648a31a · 648a31a
1 parent b0b38b2
commit 648a31a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/lib/init-action-post-helper.js b/lib/init-action-post-helper.js
diff --git a/lib/init-action-post-helper.js.map b/lib/init-action-post-helper.js.map
diff --git a/src/init-action-post-helper.ts b/src/init-action-post-helper.ts
@@ -184,13 +184,15 @@ export async function run(
     );
   }
 
-  // We do not delete uploaded SARIFs if we're on a fork, as we're missing the
-  // appropriate permissions.
-  if (
-    process.env["CODEQL_ACTION_EXPECT_UPLOAD_FAILED_SARIF"] === "true" &&
-    github.context.payload.pull_request?.head.repo.fork === false
-  ) {
-    await removeUploadedSarif(uploadFailedSarifResult, logger);
+  if (process.env["CODEQL_ACTION_EXPECT_UPLOAD_FAILED_SARIF"] === "true") {
+    if (!github.context.payload.pull_request?.head.repo.fork) {
+      await removeUploadedSarif(uploadFailedSarifResult, logger);
+    } else {
+      logger.info(
+        "Skipping deletion of failed SARIF because the workflow was triggered from a fork of " +
+          "codeql-action and doesn't have the appropriate permissions for deletion.",
+      );
+    }
   }
 
   // Upload appropriate Actions artifacts for debugging