actions/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action synced 2026-05-29 05:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up: Remove unneeded CodeQL version guard

Browse Source
This commit is contained in:
Henry Mercer
2026-03-11 19:30:13 +00:00
parent 70d5cccce1
commit d05b50b13f
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/init-action.js
Generated
+5 -8
View File
@@ -106568,19 +106568,16 @@ async function isTrapCachingEnabled(features, overlayDatabaseMode) {
}
return true;
}
async function setCppTrapCachingEnvironmentVariables(config, codeql, logger) {
async function setCppTrapCachingEnvironmentVariables(config, logger) {
if (config.languages.includes("cpp" /* cpp */)) {
const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
if (process.env[envVar]) {
logger.info(
`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`
`Environment variable ${envVar} already set, leaving it unchanged.`
);
} else if (await codeQlVersionAtLeast(codeql, "2.17.5")) {
logger.info("Enabling CodeQL C++ TRAP caching support");
core9.exportVariable(envVar, "true");
} else {
logger.info("Disabling CodeQL C++ TRAP caching support");
core9.exportVariable(envVar, "false");
logger.info("Enabling CodeQL C++ TRAP caching support.");
core9.exportVariable(envVar, "true");
}
}
}
@@ -106719,7 +106716,7 @@ async function initConfig(features, inputs) {
);
config.trapCaches = trapCaches;
config.trapCacheDownloadTime = trapCacheDownloadTime;
await setCppTrapCachingEnvironmentVariables(config, inputs.codeql, logger);
await setCppTrapCachingEnvironmentVariables(config, logger);
}
return config;
}
src/config-utils.ts
+4 -8
View File
@@ -1024,21 +1024,17 @@ async function isTrapCachingEnabled(
async function setCppTrapCachingEnvironmentVariables(
config: Config,
codeql: CodeQL,
logger: Logger,
): Promise<void> {
if (config.languages.includes(KnownLanguage.cpp)) {
const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
if (process.env[envVar]) {
logger.info(
`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`,
`Environment variable ${envVar} already set, leaving it unchanged.`,
);
} else if (await codeQlVersionAtLeast(codeql, "2.17.5")) {
logger.info("Enabling CodeQL C++ TRAP caching support");
core.exportVariable(envVar, "true");
} else {
logger.info("Disabling CodeQL C++ TRAP caching support");
core.exportVariable(envVar, "false");
logger.info("Enabling CodeQL C++ TRAP caching support.");
core.exportVariable(envVar, "true");
}
}
}
@@ -1243,7 +1239,7 @@ export async function initConfig(
config.trapCaches = trapCaches;
config.trapCacheDownloadTime = trapCacheDownloadTime;
await setCppTrapCachingEnvironmentVariables(config, inputs.codeql, logger);
await setCppTrapCachingEnvironmentVariables(config, logger);
}
return config;