Don't run autobuild in analyze if already ran in autobuild

github · Feb 7, 2024 · 8fb654e · 8fb654e
1 parent 0fe34bd
commit 8fb654e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
diff --git a/lib/autobuild-action.js.map b/lib/autobuild-action.js.map
diff --git a/lib/environment.js b/lib/environment.js
diff --git a/lib/environment.js.map b/lib/environment.js.map
diff --git a/src/analyze.ts b/src/analyze.ts
@@ -206,7 +206,8 @@ function shouldExtractLanguage(
 ): boolean {
   return (
     config.buildMode === BuildMode.None ||
-    config.buildMode === BuildMode.Autobuild ||
+    (config.buildMode === BuildMode.Autobuild &&
+      process.env[EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY] !== "true") ||
     (!config.buildMode && isScannedLanguage(language))
   );
 }

diff --git a/src/autobuild-action.ts b/src/autobuild-action.ts
@@ -9,6 +9,7 @@ import { getGitHubVersion } from "./api-client";
 import { determineAutobuildLanguages, runAutobuild } from "./autobuild";
 import { getCodeQL } from "./codeql";
 import * as configUtils from "./config-utils";
+import { EnvVar } from "./environment";
 import { Language } from "./languages";
 import { Logger, getActionsLogger } from "./logging";
 import {
@@ -119,6 +120,8 @@ async function run() {
     return;
   }
 
+  core.exportVariable(EnvVar.AUTOBUILD_DID_COMPLETE_SUCCESSFULLY, "true");
+
   await sendCompletedStatusReport(logger, startedAt, languages ?? []);
 }
 

diff --git a/src/environment.ts b/src/environment.ts
@@ -8,6 +8,9 @@ export enum EnvVar {
   /** Whether the `analyze` Action completes successfully. */
   ANALYZE_DID_COMPLETE_SUCCESSFULLY = "CODEQL_ACTION_ANALYZE_DID_COMPLETE_SUCCESSFULLY",
 
+  /** Whether the `autobuild` Action completes successfully. */
+  AUTOBUILD_DID_COMPLETE_SUCCESSFULLY = "CODEQL_ACTION_AUTOBUILD_DID_COMPLETE_SUCCESSFULLY",
+
   /** Whether the CodeQL Action has invoked the Go autobuilder. */
   DID_AUTOBUILD_GOLANG = "CODEQL_ACTION_DID_AUTOBUILD_GOLANG",