From 0b5c1fb0696653047574fdee4ed4d1ada7229139 Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Tue, 6 Oct 2026 10:37:32 +0100
Subject: [PATCH] Remove redundant CLI version requirement from
 `CppDependencyInstallation`

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 lib/entry-points.js  | 10 +++++-----
 src/analyze.ts       |  2 +-
 src/autobuild.ts     |  6 +++---
 src/feature-flags.ts |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/entry-points.js b/lib/entry-points.js
index 5857b85cb..7baf461da 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -171882,7 +171882,7 @@ var featureConfig = {
     defaultValue: false,
     envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
     legacyApi: true,
-    minimumVersion: "2.15.0"
+    minimumVersion: void 0
   },
   ["csharp_cache_bmn" /* CsharpCacheBuildModeNone */]: {
     defaultValue: false,
@@ -177508,7 +177508,7 @@ async function determineAutobuildLanguages(codeql, config, logger2) {
   }
   return languages;
 }
-async function setupCppAutobuild(codeql, logger2) {
+async function setupCppAutobuild(logger2) {
   const envVar = featureConfig["cpp_dependency_installation_enabled" /* CppDependencyInstallation */].envVar;
   const featureName = "C++ automatic installation of dependencies";
   const gitHubVersion = await getGitHubVersion();
@@ -177519,7 +177519,7 @@ async function setupCppAutobuild(codeql, logger2) {
     getTemporaryDirectory(),
     logger2
   );
-  if (await features.getValue("cpp_dependency_installation_enabled" /* CppDependencyInstallation */, codeql)) {
+  if (await features.getValue("cpp_dependency_installation_enabled" /* CppDependencyInstallation */)) {
     if (process.env["RUNNER_ENVIRONMENT" /* RUNNER_ENVIRONMENT */] === "self-hosted" && process.env[envVar] !== "true") {
       logger2.info(
         `Disabling ${featureName} as we are on a self-hosted runner.${getWorkflowEventName() !== "dynamic" ? ` To override this, set the ${envVar} environment variable to 'true' in your workflow. See ${"https://docs.github.com/en/actions/learn-github-actions/variables#defining-environment-variables-for-a-single-workflow" /* DEFINE_ENV_VARIABLES */} for more information.` : ""}`
@@ -177540,7 +177540,7 @@ async function runAutobuild(config, language, logger2) {
   logger2.startGroup(`Attempting to automatically build ${language} code`);
   const codeQL = await getCodeQL(logger2, config.codeQLCmd);
   if (language === "cpp" /* cpp */) {
-    await setupCppAutobuild(codeQL, logger2);
+    await setupCppAutobuild(logger2);
   }
   if (config.buildMode) {
     await codeQL.extractUsingBuildMode(config, language);
@@ -177864,7 +177864,7 @@ async function runExtraction(codeql, features, config, logger2) {
       }
       if (config.buildMode) {
         if (language === "cpp" /* cpp */ && config.buildMode === "autobuild" /* Autobuild */) {
-          await setupCppAutobuild(codeql, logger2);
+          await setupCppAutobuild(logger2);
         }
         if (language === "java" /* java */ && config.buildMode === "none" /* None */) {
           process.env["CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_DEPENDENCY_DIR"] = getJavaTempDependencyDir();
diff --git a/src/analyze.ts b/src/analyze.ts
index d585fd6d8..4eeb447e1 100644
--- a/src/analyze.ts
+++ b/src/analyze.ts
@@ -124,7 +124,7 @@ export async function runExtraction(
           language === BuiltInLanguage.cpp &&
           config.buildMode === BuildMode.Autobuild
         ) {
-          await setupCppAutobuild(codeql, logger);
+          await setupCppAutobuild(logger);
         }
 
         // The Java and C# `build-mode: none` extractors place dependencies in the
diff --git a/src/autobuild.ts b/src/autobuild.ts
index 49b790102..28f89b115 100644
--- a/src/autobuild.ts
+++ b/src/autobuild.ts
@@ -112,7 +112,7 @@ export async function determineAutobuildLanguages(
   return languages;
 }
 
-export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
+export async function setupCppAutobuild(logger: Logger) {
   const envVar = featureConfig[Feature.CppDependencyInstallation].envVar;
   const featureName = "C++ automatic installation of dependencies";
   const gitHubVersion = await getGitHubVersion();
@@ -123,7 +123,7 @@ export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
     getTemporaryDirectory(),
     logger,
   );
-  if (await features.getValue(Feature.CppDependencyInstallation, codeql)) {
+  if (await features.getValue(Feature.CppDependencyInstallation)) {
     // disable autoinstall on self-hosted runners unless explicitly requested
     if (
       process.env[ActionsEnvVars.RUNNER_ENVIRONMENT] === "self-hosted" &&
@@ -157,7 +157,7 @@ export async function runAutobuild(
   logger.startGroup(`Attempting to automatically build ${language} code`);
   const codeQL = await getCodeQL(logger, config.codeQLCmd);
   if (language === BuiltInLanguage.cpp) {
-    await setupCppAutobuild(codeQL, logger);
+    await setupCppAutobuild(logger);
   }
   if (config.buildMode) {
     await codeQL.extractUsingBuildMode(config, language);
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
index 59b50e2df..f74d0bd25 100644
--- a/src/feature-flags.ts
+++ b/src/feature-flags.ts
@@ -240,7 +240,7 @@ export const featureConfig = {
     defaultValue: false,
     envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
     legacyApi: true,
-    minimumVersion: "2.15.0",
+    minimumVersion: undefined,
   },
   [Feature.CsharpCacheBuildModeNone]: {
     defaultValue: false,