C++: Make C++ TRAP caching conditional on TRAP caching being enabled in general.

This commit is contained in:
Alexandre Boulgakov 2024-01-17 16:18:48 +00:00 committed by GitHub
parent f1915cce98
commit a246aaa40c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions

3
lib/init-action.js generated
View file

@ -249,7 +249,8 @@ async function run() {
if (process.env[envVar]) { if (process.env[envVar]) {
logger.info(`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`); logger.info(`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`);
} }
else if (await features.getValue(feature_flags_1.Feature.CppTrapCachingEnabled, codeql)) { else if (getTrapCachingEnabled() &&
(await features.getValue(feature_flags_1.Feature.CppTrapCachingEnabled, codeql))) {
logger.info("Enabling CodeQL C++ TRAP caching support"); logger.info("Enabling CodeQL C++ TRAP caching support");
core.exportVariable(envVar, "true"); core.exportVariable(envVar, "true");
} }

File diff suppressed because one or more lines are too long

View file

@ -449,7 +449,8 @@ async function run() {
`Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`, `Environment variable ${envVar} already set. Not en/disabling CodeQL C++ TRAP caching support`,
); );
} else if ( } else if (
await features.getValue(Feature.CppTrapCachingEnabled, codeql) getTrapCachingEnabled() &&
(await features.getValue(Feature.CppTrapCachingEnabled, codeql))
) { ) {
logger.info("Enabling CodeQL C++ TRAP caching support"); logger.info("Enabling CodeQL C++ TRAP caching support");
core.exportVariable(envVar, "true"); core.exportVariable(envVar, "true");