Run autobuild script via direct tracing when feature enabled

github · Apr 12, 2024 · cbe29f5 · cbe29f5
1 parent 8f057a3
commit cbe29f5
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 25 deletions.
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
diff --git a/lib/analyze-action.js.map b/lib/analyze-action.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/autobuild.js b/lib/autobuild.js
diff --git a/lib/autobuild.js.map b/lib/autobuild.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/codeql.test.js b/lib/codeql.test.js
diff --git a/lib/codeql.test.js.map b/lib/codeql.test.js.map
diff --git a/src/analyze-action.ts b/src/analyze-action.ts
@@ -181,7 +181,7 @@ async function runAutobuildIfLegacyGoWorkflow(
   logger.debug(
     "Running Go autobuild because extraction output (TRAP files) for Go code has not been found.",
   );
-  await runAutobuild(Language.go, config, features, logger);
+  await runAutobuild(config, Language.go, features, logger);
 }
 
 async function run() {

diff --git a/src/autobuild-action.ts b/src/autobuild-action.ts
@@ -122,7 +122,7 @@ async function run() {
       }
       for (const language of languages) {
         currentLanguage = language;
-        await runAutobuild(language, config, features, logger);
+        await runAutobuild(config, language, features, logger);
       }
     }
   } catch (unwrappedError) {

diff --git a/src/autobuild.ts b/src/autobuild.ts
@@ -157,8 +157,8 @@ export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
 }
 
 export async function runAutobuild(
-  language: Language,
   config: configUtils.Config,
+  language: Language,
   features: FeatureEnablement,
   logger: Logger,
 ) {
@@ -173,7 +173,7 @@ export async function runAutobuild(
   ) {
     await codeQL.extractUsingBuildMode(config, language);
   } else {
-    await codeQL.runAutobuild(language, config.debugMode);
+    await codeQL.runAutobuild(config, language, features);
   }
   if (language === Language.go) {
     core.exportVariable(EnvVar.DID_AUTOBUILD_GOLANG, "true");

diff --git a/src/codeql.test.ts b/src/codeql.test.ts
@@ -910,7 +910,12 @@ test("runTool summarizes autobuilder errors", async (t) => {
   sinon.stub(safeWhich, "safeWhich").resolves("");
 
   await t.throwsAsync(
-    async () => await codeqlObject.runAutobuild(Language.java, false),
+    async () =>
+      await codeqlObject.runAutobuild(
+        stubConfig,
+        Language.java,
+        createFeatures([]),
+      ),
     {
       instanceOf: CommandInvocationError,
       message:
@@ -938,7 +943,12 @@ test("runTool truncates long autobuilder errors", async (t) => {
   sinon.stub(safeWhich, "safeWhich").resolves("");
 
   await t.throwsAsync(
-    async () => await codeqlObject.runAutobuild(Language.java, false),
+    async () =>
+      await codeqlObject.runAutobuild(
+        stubConfig,
+        Language.java,
+        createFeatures([]),
+      ),
     {
       instanceOf: CommandInvocationError,
       message: