More testing

.github/workflows/__go-tracing-autobuilder.yml

@@ -13,6 +13,7 @@ on:
     branches:
     - main
     - releases/v2
+    - henrymercer/cli-autobuild-testing
   pull_request:
     types:
     - opened
@@ -25,26 +26,6 @@ jobs:
     strategy:
       matrix:
         include:
-        - os: ubuntu-20.04
-          version: stable-20211005
-        - os: macos-latest
-          version: stable-20211005
-        - os: ubuntu-20.04
-          version: stable-20220120
-        - os: macos-latest
-          version: stable-20220120
-        - os: ubuntu-latest
-          version: stable-20220401
-        - os: macos-latest
-          version: stable-20220401
-        - os: ubuntu-latest
-          version: cached
-        - os: macos-latest
-          version: cached
-        - os: ubuntu-latest
-          version: latest
-        - os: macos-latest
-          version: latest
         - os: ubuntu-latest
           version: nightly-latest
         - os: macos-latest
@@ -68,7 +49,7 @@ jobs:
     - uses: ./../action/init
       with:
         languages: go
-        tools: ${{ steps.prepare-test.outputs.tools-url }}
+        tools: https://github.com/dsp-testing/henrymercer-status-test/releases/download/codeql-bundle-20230322/codeql-bundle-linux64.tar.gz
     - uses: ./../action/autobuild
     - uses: ./../action/analyze
       with:

.github/workflows/__test-autobuild-working-dir.yml

@@ -13,6 +13,7 @@ on:
     branches:
     - main
     - releases/v2
+    - henrymercer/cli-autobuild-testing
   pull_request:
     types:
     - opened
@@ -48,7 +49,7 @@ jobs:
     - uses: ./../action/init
       with:
         languages: java
-        tools: ${{ steps.prepare-test.outputs.tools-url }}
+        tools: https://github.com/dsp-testing/henrymercer-status-test/releases/download/codeql-bundle-20230322/codeql-bundle-linux64.tar.gz
     - uses: ./../action/autobuild
       with:
         working-directory: autobuild-dir

lib/analyze-action.js

@@ -132,7 +132,7 @@ async function runAutobuildIfLegacyGoWorkflow(config, logger) {
         }
         return;
     }
-    await (0, autobuild_1.runAutobuild)(languages_1.Language.go, config, logger);
+    await (0, autobuild_1.runAutobuildScript)(languages_1.Language.go, config, logger);
 }
 async function run() {
     const startedAt = new Date();

lib/autobuild-action.js

@@ -27,9 +27,12 @@ const core = __importStar(require("@actions/core"));
 const actions_util_1 = require("./actions-util");
 const api_client_1 = require("./api-client");
 const autobuild_1 = require("./autobuild");
+const codeql_1 = require("./codeql");
 const configUtils = __importStar(require("./config-utils"));
+const feature_flags_1 = require("./feature-flags");
 const languages_1 = require("./languages");
 const logging_1 = require("./logging");
+const repository_1 = require("./repository");
 const shared_environment_1 = require("./shared-environment");
 const util_1 = require("./util");
 async function sendCompletedStatusReport(startedAt, allLanguages, failingLanguage, cause) {
@@ -58,18 +61,27 @@ async function run() {
         if (config === undefined) {
             throw new Error("Config file could not be found at expected location. Has the 'init' action been called?");
         }
-        languages = await (0, autobuild_1.determineAutobuildLanguages)(config, logger);
-        if (languages !== undefined) {
-            const workingDirectory = (0, actions_util_1.getOptionalInput)("working-directory");
-            if (workingDirectory) {
-                logger.info(`Changing autobuilder working directory to ${workingDirectory}`);
-                process.chdir(workingDirectory);
-            }
-            for (const language of languages) {
-                currentLanguage = language;
-                await (0, autobuild_1.runAutobuild)(language, config, logger);
-                if (language === languages_1.Language.go) {
-                    core.exportVariable(shared_environment_1.CODEQL_ACTION_DID_AUTOBUILD_GOLANG, "true");
+        const repositoryNwo = (0, repository_1.parseRepositoryNwo)((0, util_1.getRequiredEnvParam)("GITHUB_REPOSITORY"));
+        const features = new feature_flags_1.Features(gitHubVersion, repositoryNwo, (0, actions_util_1.getTemporaryDirectory)(), logger);
+        const codeql = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
+        const workingDirectory = (0, actions_util_1.getOptionalInput)("working-directory");
+        if (await features.getValue(feature_flags_1.Feature.CliAutobuildEnabled, codeql)) {
+            logger.debug("Autobuilding using the CLI.");
+            await codeql.databaseAutobuild(config.dbLocation, workingDirectory);
+        }
+        else {
+            languages = await (0, autobuild_1.determineAutobuildLanguages)(config, logger);
+            if (languages !== undefined) {
+                if (workingDirectory) {
+                    logger.info(`Changing autobuilder working directory to ${workingDirectory}`);
+                    process.chdir(workingDirectory);
+                }
+                for (const language of languages) {
+                    currentLanguage = language;
+                    await (0, autobuild_1.runAutobuildScript)(language, config, logger);
+                    if (language === languages_1.Language.go) {
+                        core.exportVariable(shared_environment_1.CODEQL_ACTION_DID_AUTOBUILD_GOLANG, "true");
+                    }
                 }
             }
         }

lib/autobuild-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autobuild-action.js","sourceRoot":"","sources":["../src/autobuild-action.ts"],"names":[],"mappings":"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"}

lib/autobuild.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAutobuild = exports.determineAutobuildLanguages = void 0;
+exports.runAutobuildScript = exports.determineAutobuildLanguages = void 0;
 const codeql_1 = require("./codeql");
 const languages_1 = require("./languages");
 async function determineAutobuildLanguages(config, logger) {
@@ -70,11 +70,11 @@ async function determineAutobuildLanguages(config, logger) {
     return languages;
 }
 exports.determineAutobuildLanguages = determineAutobuildLanguages;
-async function runAutobuild(language, config, logger) {
+async function runAutobuildScript(language, config, logger) {
     logger.startGroup(`Attempting to automatically build ${language} code`);
     const codeQL = await (0, codeql_1.getCodeQL)(config.codeQLCmd);
-    await codeQL.runAutobuild(language);
+    await codeQL.runAutobuildScript(language);
     logger.endGroup();
 }
-exports.runAutobuild = runAutobuild;
+exports.runAutobuildScript = runAutobuildScript;
 //# sourceMappingURL=autobuild.js.map

lib/autobuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAErC,2CAAyD;AAGlD,KAAK,UAAU,2BAA2B,CAC/C,MAA0B,EAC1B,MAAc;IAEd,0CAA0C;IAC1C,mFAAmF;IACnF,oFAAoF;IACpF,4EAA4E;IAC5E,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,IAAA,4BAAgB,EAAC,CAAC,CAAC,CACpB,CAAC;IAEF,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,CAAC,IAAI,CACT,iEAAiE,CAClE,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,oBAAQ,CAAC,EAAE,CACzB,CAAC;IAEF,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,yEAAyE;IACzE,UAAU;IACV,IAAI,2BAA2B,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;QAChD,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;KAChD;IACD,uEAAuE;IACvE,wCAAwC;IACxC,IAAI,kBAAkB,CAAC,MAAM,KAAK,2BAA2B,CAAC,MAAM,EAAE;QACpE,SAAS,CAAC,IAAI,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7B;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,2EAA2E;IAC3E,4EAA4E;IAC5E,2CAA2C;IAC3C,uEAAuE;IACvE,2EAA2E;IAC3E,uEAAuE;IACvE,yCAAyC;IACzC,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAM,CAAC,OAAO,CACZ,oCAAoC,SAAS,CAAC,IAAI,CAChD,OAAO,CACR,8BAA8B,2BAA2B;aACvD,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CACH,OAAO,CACR,kFAAkF;YACnF,4BAA4B;YAC5B,0NAA0N,CAC7N,CAAC;KACH;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAtFD,kEAsFC;AAEM,KAAK,UAAU,YAAY,CAChC,QAAkB,EAClB,MAA0B,EAC1B,MAAc;IAEd,MAAM,CAAC,UAAU,CAAC,qCAAqC,QAAQ,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,CAAC,QAAQ,EAAE,CAAC;AACpB,CAAC;AATD,oCASC"}
+{"version":3,"file":"autobuild.js","sourceRoot":"","sources":["../src/autobuild.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAErC,2CAAyD;AAGlD,KAAK,UAAU,2BAA2B,CAC/C,MAA0B,EAC1B,MAAc;IAEd,0CAA0C;IAC1C,mFAAmF;IACnF,oFAAoF;IACpF,4EAA4E;IAC5E,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvD,IAAA,4BAAgB,EAAC,CAAC,CAAC,CACpB,CAAC;IAEF,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,CAAC,IAAI,CACT,iEAAiE,CAClE,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,MAAM,2BAA2B,GAAG,kBAAkB,CAAC,MAAM,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,oBAAQ,CAAC,EAAE,CACzB,CAAC;IAEF,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,yEAAyE;IACzE,UAAU;IACV,IAAI,2BAA2B,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;QAChD,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;KAChD;IACD,uEAAuE;IACvE,wCAAwC;IACxC,IAAI,kBAAkB,CAAC,MAAM,KAAK,2BAA2B,CAAC,MAAM,EAAE;QACpE,SAAS,CAAC,IAAI,CAAC,oBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7B;IAED,MAAM,CAAC,KAAK,CAAC,kBAAkB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D,2EAA2E;IAC3E,4EAA4E;IAC5E,2CAA2C;IAC3C,uEAAuE;IACvE,2EAA2E;IAC3E,uEAAuE;IACvE,yCAAyC;IACzC,IAAI,2BAA2B,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1C,MAAM,CAAC,OAAO,CACZ,oCAAoC,SAAS,CAAC,IAAI,CAChD,OAAO,CACR,8BAA8B,2BAA2B;aACvD,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CACH,OAAO,CACR,kFAAkF;YACnF,4BAA4B;YAC5B,0NAA0N,CAC7N,CAAC;KACH;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAtFD,kEAsFC;AAEM,KAAK,UAAU,kBAAkB,CACtC,QAAkB,EAClB,MAA0B,EAC1B,MAAc;IAEd,MAAM,CAAC,UAAU,CAAC,qCAAqC,QAAQ,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,CAAC,QAAQ,EAAE,CAAC;AACpB,CAAC;AATD,gDASC"}

lib/codeql.js

@@ -179,7 +179,7 @@ function setCodeQL(partialCodeql) {
         getTracerEnv: resolveFunction(partialCodeql, "getTracerEnv"),
         databaseInit: resolveFunction(partialCodeql, "databaseInit"),
         databaseInitCluster: resolveFunction(partialCodeql, "databaseInitCluster"),
-        runAutobuild: resolveFunction(partialCodeql, "runAutobuild"),
+        runAutobuildScript: resolveFunction(partialCodeql, "runAutobuildScript"),
         extractScannedLanguage: resolveFunction(partialCodeql, "extractScannedLanguage"),
         finalizeDatabase: resolveFunction(partialCodeql, "finalizeDatabase"),
         resolveLanguages: resolveFunction(partialCodeql, "resolveLanguages"),
@@ -193,6 +193,7 @@ function setCodeQL(partialCodeql) {
         databasePrintBaseline: resolveFunction(partialCodeql, "databasePrintBaseline"),
         databaseExportDiagnostics: resolveFunction(partialCodeql, "databaseExportDiagnostics"),
         diagnosticsExport: resolveFunction(partialCodeql, "diagnosticsExport"),
+        databaseAutobuild: resolveFunction(partialCodeql, "databaseAutobuild"),
     };
     return cachedCodeQL;
 }
@@ -354,22 +355,12 @@ async function getCodeQLForCmd(cmd, checkVersion) {
                 ...getExtraOptionsFromEnv(["database", "init"]),
             ], { stdin: externalRepositoryToken });
         },
-        async runAutobuild(language) {
+        async runAutobuildScript(language) {
             const cmdName = process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh";
             // The autobuilder for Swift is located in the experimental/ directory.
             const possibleExperimentalDir = language === languages_1.Language.swift ? "experimental" : "";
             const autobuildCmd = path.join(path.dirname(cmd), possibleExperimentalDir, language, "tools", cmdName);
-            // Update JAVA_TOOL_OPTIONS to contain '-Dhttp.keepAlive=false'
-            // This is because of an issue with Azure pipelines timing out connections after 4 minutes
-            // and Maven not properly handling closed connections
-            // Otherwise long build processes will timeout when pulling down Java packages
-            // https://developercommunity.visualstudio.com/content/problem/292284/maven-hosted-agent-connection-timeout.html
-            const javaToolOptions = process.env["JAVA_TOOL_OPTIONS"] || "";
-            process.env["JAVA_TOOL_OPTIONS"] = [
-                ...javaToolOptions.split(/\s+/),
-                "-Dhttp.keepAlive=false",
-                "-Dmaven.wagon.http.pool=false",
-            ].join(" ");
+            updateEnvForAutobuild();
             // On macOS, System Integrity Protection (SIP) typically interferes with
             // CodeQL build tracing of protected binaries.
             // The usual workaround is to prefix `$CODEQL_RUNNER` to build commands:
@@ -656,6 +647,20 @@ async function getCodeQLForCmd(cmd, checkVersion) {
             }
             await new toolrunner.ToolRunner(cmd, args).exec();
         },
+        async databaseAutobuild(databasePath, workingDirectory) {
+            const args = [
+                "database",
+                "autobuild",
+                "--db-cluster",
+                databasePath,
+                ...getExtraOptionsFromEnv(["database", "autobuild"]),
+            ];
+            if (workingDirectory !== undefined) {
+                args.push("--working-dir", workingDirectory);
+            }
+            updateEnvForAutobuild();
+            await new toolrunner.ToolRunner(cmd, args).exec();
+        },
     };
     // To ensure that status reports include the CodeQL CLI version wherever
     // possible, we want to call getVersion(), which populates the version value
@@ -856,4 +861,17 @@ async function enrichEnvironment(codeql) {
     }
 }
 exports.enrichEnvironment = enrichEnvironment;
+function updateEnvForAutobuild() {
+    // Update JAVA_TOOL_OPTIONS to contain '-Dhttp.keepAlive=false'
+    // This is because of an issue with Azure pipelines timing out connections after 4 minutes
+    // and Maven not properly handling closed connections
+    // Otherwise long build processes will timeout when pulling down Java packages
+    // https://developercommunity.visualstudio.com/content/problem/292284/maven-hosted-agent-connection-timeout.html
+    const javaToolOptions = process.env["JAVA_TOOL_OPTIONS"] || "";
+    process.env["JAVA_TOOL_OPTIONS"] = [
+        ...javaToolOptions.split(/\s+/),
+        "-Dhttp.keepAlive=false",
+        "-Dmaven.wagon.http.pool=false",
+    ].join(" ");
+}
 //# sourceMappingURL=codeql.js.map

lib/feature-flags.js

@@ -34,6 +34,7 @@ const DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 const DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
 var Feature;
 (function (Feature) {
+    Feature["CliAutobuildEnabled"] = "cli_autobuild_enabled";
     Feature["CliConfigFileEnabled"] = "cli_config_file_enabled";
     Feature["DisableKotlinAnalysisEnabled"] = "disable_kotlin_analysis_enabled";
     Feature["ExportCodeScanningConfigEnabled"] = "export_code_scanning_config_enabled";
@@ -42,16 +43,21 @@ var Feature;
     Feature["UploadFailedSarifEnabled"] = "upload_failed_sarif_enabled";
 })(Feature = exports.Feature || (exports.Feature = {}));
 exports.featureConfig = {
-    [Feature.DisableKotlinAnalysisEnabled]: {
-        envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
-        minimumVersion: undefined,
-        defaultValue: false,
+    [Feature.CliAutobuildEnabled]: {
+        envVar: "CODEQL_ACTION_USE_CLI_AUTOBUILD",
+        minimumVersion: "2.12.5",
+        defaultValue: true,
     },
     [Feature.CliConfigFileEnabled]: {
         envVar: "CODEQL_PASS_CONFIG_TO_CLI",
         minimumVersion: "2.11.6",
         defaultValue: true,
     },
+    [Feature.DisableKotlinAnalysisEnabled]: {
+        envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
+        minimumVersion: undefined,
+        defaultValue: false,
+    },
     [Feature.ExportCodeScanningConfigEnabled]: {
         envVar: "CODEQL_ACTION_EXPORT_CODE_SCANNING_CONFIG",
         minimumVersion: "2.12.3",

src/analyze-action.ts

@@ -15,7 +15,7 @@ import {
   runQueries,
 } from "./analyze";
 import { getApiDetails, getGitHubVersion } from "./api-client";
-import { runAutobuild } from "./autobuild";
+import { runAutobuildScript } from "./autobuild";
 import { enrichEnvironment, getCodeQL } from "./codeql";
 import { Config, getConfig } from "./config-utils";
 import { uploadDatabases } from "./database-upload";
@@ -168,7 +168,7 @@ async function runAutobuildIfLegacyGoWorkflow(config: Config, logger: Logger) {
     }
     return;
   }
-  await runAutobuild(Language.go, config, logger);
+  await runAutobuildScript(Language.go, config, logger);
 }
 
 async function run() {

src/autobuild-action.ts

@@ -10,12 +10,19 @@ import {
   StatusReportBase,
 } from "./actions-util";
 import { getGitHubVersion } from "./api-client";
-import { determineAutobuildLanguages, runAutobuild } from "./autobuild";
+import { determineAutobuildLanguages, runAutobuildScript } from "./autobuild";
+import { getCodeQL } from "./codeql";
 import * as configUtils from "./config-utils";
+import { Feature, Features } from "./feature-flags";
 import { Language } from "./languages";
 import { getActionsLogger } from "./logging";
+import { parseRepositoryNwo } from "./repository";
 import { CODEQL_ACTION_DID_AUTOBUILD_GOLANG } from "./shared-environment";
-import { checkGitHubVersionInRange, initializeEnvironment } from "./util";
+import {
+  checkGitHubVersionInRange,
+  getRequiredEnvParam,
+  initializeEnvironment,
+} from "./util";
 
 interface AutobuildStatusReport extends StatusReportBase {
   /** Comma-separated set of languages being auto-built. */
@@ -72,20 +79,38 @@ async function run() {
       );
     }
 
-    languages = await determineAutobuildLanguages(config, logger);
-    if (languages !== undefined) {
-      const workingDirectory = getOptionalInput("working-directory");
-      if (workingDirectory) {
-        logger.info(
-          `Changing autobuilder working directory to ${workingDirectory}`
-        );
-        process.chdir(workingDirectory);
-      }
-      for (const language of languages) {
-        currentLanguage = language;
-        await runAutobuild(language, config, logger);
-        if (language === Language.go) {
-          core.exportVariable(CODEQL_ACTION_DID_AUTOBUILD_GOLANG, "true");
+    const repositoryNwo = parseRepositoryNwo(
+      getRequiredEnvParam("GITHUB_REPOSITORY")
+    );
+
+    const features = new Features(
+      gitHubVersion,
+      repositoryNwo,
+      getTemporaryDirectory(),
+      logger
+    );
+
+    const codeql = await getCodeQL(config.codeQLCmd);
+    const workingDirectory = getOptionalInput("working-directory");
+
+    if (await features.getValue(Feature.CliAutobuildEnabled, codeql)) {
+      logger.debug("Autobuilding using the CLI.");
+      await codeql.databaseAutobuild(config.dbLocation, workingDirectory);
+    } else {
+      languages = await determineAutobuildLanguages(config, logger);
+      if (languages !== undefined) {
+        if (workingDirectory) {
+          logger.info(
+            `Changing autobuilder working directory to ${workingDirectory}`
+          );
+          process.chdir(workingDirectory);
+        }
+        for (const language of languages) {
+          currentLanguage = language;
+          await runAutobuildScript(language, config, logger);
+          if (language === Language.go) {
+            core.exportVariable(CODEQL_ACTION_DID_AUTOBUILD_GOLANG, "true");
+          }
         }
       }
     }

src/autobuild.ts

@@ -91,13 +91,13 @@ export async function determineAutobuildLanguages(
   return languages;
 }
 
-export async function runAutobuild(
+export async function runAutobuildScript(
   language: Language,
   config: configUtils.Config,
   logger: Logger
 ) {
   logger.startGroup(`Attempting to automatically build ${language} code`);
   const codeQL = await getCodeQL(config.codeQLCmd);
-  await codeQL.runAutobuild(language);
+  await codeQL.runAutobuildScript(language);
   logger.endGroup();
 }

src/codeql.ts

@@ -101,9 +101,9 @@ export interface CodeQL {
     logger: Logger
   ): Promise<void>;
   /**
-   * Runs the autobuilder for the given language.
+   * Runs the autobuild script for the given language.
    */
-  runAutobuild(language: Language): Promise<void>;
+  runAutobuildScript(language: Language): Promise<void>;
   /**
    * Extract code for a scanned language using 'codeql database trace-command'
    * and running the language extractor.
@@ -210,6 +210,13 @@ export interface CodeQL {
     config: Config,
     features: FeatureEnablement
   ): Promise<void>;
+  /**
+   * Run 'codeql database autobuild'.
+   */
+  databaseAutobuild(
+    dbClusterPath: string,
+    workingDirectory: string | undefined
+  ): Promise<void>;
 }
 
 export interface ResolveLanguagesOutput {
@@ -421,7 +428,7 @@ export function setCodeQL(partialCodeql: Partial<CodeQL>): CodeQL {
     getTracerEnv: resolveFunction(partialCodeql, "getTracerEnv"),
     databaseInit: resolveFunction(partialCodeql, "databaseInit"),
     databaseInitCluster: resolveFunction(partialCodeql, "databaseInitCluster"),
-    runAutobuild: resolveFunction(partialCodeql, "runAutobuild"),
+    runAutobuildScript: resolveFunction(partialCodeql, "runAutobuildScript"),
     extractScannedLanguage: resolveFunction(
       partialCodeql,
       "extractScannedLanguage"
@@ -450,6 +457,7 @@ export function setCodeQL(partialCodeql: Partial<CodeQL>): CodeQL {
       "databaseExportDiagnostics"
     ),
     diagnosticsExport: resolveFunction(partialCodeql, "diagnosticsExport"),
+    databaseAutobuild: resolveFunction(partialCodeql, "databaseAutobuild"),
   };
   return cachedCodeQL;
 }
@@ -666,7 +674,7 @@ export async function getCodeQLForCmd(
         { stdin: externalRepositoryToken }
       );
     },
-    async runAutobuild(language: Language) {
+    async runAutobuildScript(language: Language) {
       const cmdName =
         process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh";
       // The autobuilder for Swift is located in the experimental/ directory.
@@ -680,17 +688,7 @@ export async function getCodeQLForCmd(
         cmdName
       );
 
-      // Update JAVA_TOOL_OPTIONS to contain '-Dhttp.keepAlive=false'
-      // This is because of an issue with Azure pipelines timing out connections after 4 minutes
-      // and Maven not properly handling closed connections
-      // Otherwise long build processes will timeout when pulling down Java packages
-      // https://developercommunity.visualstudio.com/content/problem/292284/maven-hosted-agent-connection-timeout.html
-      const javaToolOptions = process.env["JAVA_TOOL_OPTIONS"] || "";
-      process.env["JAVA_TOOL_OPTIONS"] = [
-        ...javaToolOptions.split(/\s+/),
-        "-Dhttp.keepAlive=false",
-        "-Dmaven.wagon.http.pool=false",
-      ].join(" ");
+      updateEnvForAutobuild();
 
       // On macOS, System Integrity Protection (SIP) typically interferes with
       // CodeQL build tracing of protected binaries.
@@ -1071,6 +1069,23 @@ export async function getCodeQLForCmd(
       }
       await new toolrunner.ToolRunner(cmd, args).exec();
     },
+    async databaseAutobuild(
+      databasePath: string,
+      workingDirectory: string | undefined
+    ): Promise<void> {
+      const args = [
+        "database",
+        "autobuild",
+        "--db-cluster",
+        databasePath,
+        ...getExtraOptionsFromEnv(["database", "autobuild"]),
+      ];
+      if (workingDirectory !== undefined) {
+        args.push("--working-dir", workingDirectory);
+      }
+      updateEnvForAutobuild();
+      await new toolrunner.ToolRunner(cmd, args).exec();
+    },
   };
   // To ensure that status reports include the CodeQL CLI version wherever
   // possible, we want to call getVersion(), which populates the version value
@@ -1315,3 +1330,17 @@ export async function enrichEnvironment(codeql: CodeQL) {
     core.exportVariable(EnvVar.FEATURE_SANDWICH, "true");
   }
 }
+
+function updateEnvForAutobuild(): void {
+  // Update JAVA_TOOL_OPTIONS to contain '-Dhttp.keepAlive=false'
+  // This is because of an issue with Azure pipelines timing out connections after 4 minutes
+  // and Maven not properly handling closed connections
+  // Otherwise long build processes will timeout when pulling down Java packages
+  // https://developercommunity.visualstudio.com/content/problem/292284/maven-hosted-agent-connection-timeout.html
+  const javaToolOptions = process.env["JAVA_TOOL_OPTIONS"] || "";
+  process.env["JAVA_TOOL_OPTIONS"] = [
+    ...javaToolOptions.split(/\s+/),
+    "-Dhttp.keepAlive=false",
+    "-Dmaven.wagon.http.pool=false",
+  ].join(" ");
+}

src/feature-flags.ts

@@ -37,6 +37,7 @@ export interface FeatureEnablement {
 }
 
 export enum Feature {
+  CliAutobuildEnabled = "cli_autobuild_enabled",
   CliConfigFileEnabled = "cli_config_file_enabled",
   DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled",
   ExportCodeScanningConfigEnabled = "export_code_scanning_config_enabled",
@@ -49,16 +50,21 @@ export const featureConfig: Record<
   Feature,
   { envVar: string; minimumVersion: string | undefined; defaultValue: boolean }
 > = {
-  [Feature.DisableKotlinAnalysisEnabled]: {
-    envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
-    minimumVersion: undefined,
-    defaultValue: false,
+  [Feature.CliAutobuildEnabled]: {
+    envVar: "CODEQL_ACTION_USE_CLI_AUTOBUILD",
+    minimumVersion: "2.12.5",
+    defaultValue: true,
   },
   [Feature.CliConfigFileEnabled]: {
     envVar: "CODEQL_PASS_CONFIG_TO_CLI",
     minimumVersion: "2.11.6",
     defaultValue: true,
   },
+  [Feature.DisableKotlinAnalysisEnabled]: {
+    envVar: "CODEQL_DISABLE_KOTLIN_ANALYSIS",
+    minimumVersion: undefined,
+    defaultValue: false,
+  },
   [Feature.ExportCodeScanningConfigEnabled]: {
     envVar: "CODEQL_ACTION_EXPORT_CODE_SCANNING_CONFIG",
     minimumVersion: "2.12.3",
@@ -69,7 +75,6 @@ export const featureConfig: Record<
     minimumVersion: "2.12.4",
     defaultValue: false,
   },
-
   [Feature.MlPoweredQueriesEnabled]: {
     envVar: "CODEQL_ML_POWERED_QUERIES",
     minimumVersion: "2.7.5",