Skip to content

Commit 0b5c1fb

Browse files
henrymercerCopilot
andcommitted
Remove redundant CLI version requirement from CppDependencyInstallation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent a8c7110 commit 0b5c1fb

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎lib/entry-points.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/analyze.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ export async function runExtraction(
124124
language === BuiltInLanguage.cpp &&
125125
config.buildMode === BuildMode.Autobuild
126126
) {
127-
await setupCppAutobuild(codeql, logger);
127+
await setupCppAutobuild(logger);
128128
}
129129

130130
// The Java and C# `build-mode: none` extractors place dependencies in the

‎src/autobuild.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export async function determineAutobuildLanguages(
112112
return languages;
113113
}
114114

115-
export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
115+
export async function setupCppAutobuild(logger: Logger) {
116116
const envVar = featureConfig[Feature.CppDependencyInstallation].envVar;
117117
const featureName = "C++ automatic installation of dependencies";
118118
const gitHubVersion = await getGitHubVersion();
@@ -123,7 +123,7 @@ export async function setupCppAutobuild(codeql: CodeQL, logger: Logger) {
123123
getTemporaryDirectory(),
124124
logger,
125125
);
126-
if (await features.getValue(Feature.CppDependencyInstallation, codeql)) {
126+
if (await features.getValue(Feature.CppDependencyInstallation)) {
127127
// disable autoinstall on self-hosted runners unless explicitly requested
128128
if (
129129
process.env[ActionsEnvVars.RUNNER_ENVIRONMENT] === "self-hosted" &&
@@ -157,7 +157,7 @@ export async function runAutobuild(
157157
logger.startGroup(`Attempting to automatically build ${language} code`);
158158
const codeQL = await getCodeQL(logger, config.codeQLCmd);
159159
if (language === BuiltInLanguage.cpp) {
160-
await setupCppAutobuild(codeQL, logger);
160+
await setupCppAutobuild(logger);
161161
}
162162
if (config.buildMode) {
163163
await codeQL.extractUsingBuildMode(config, language);

‎src/feature-flags.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export const featureConfig = {
240240
defaultValue: false,
241241
envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES",
242242
legacyApi: true,
243-
minimumVersion: "2.15.0",
243+
minimumVersion: undefined,
244244
},
245245
[Feature.CsharpCacheBuildModeNone]: {
246246
defaultValue: false,

0 commit comments

Comments
 (0)