C++: Refactor CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE

This commit is contained in:
Calum Grant 2024-10-25 09:51:57 +01:00
parent 0d2a78f583
commit 802a7ed0bc
3 changed files with 9 additions and 23 deletions

16
lib/init-action.js generated
View file

@ -318,18 +318,10 @@ async function run() {
}
// Set CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE
if (config.languages.includes(languages_1.Language.cpp)) {
const bmn_var = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
if (process.env[bmn_var]) {
logger.info("CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE is already set");
}
else if (await features.getValue(feature_flags_1.Feature.CppBuildModeNone, codeql)) {
logger.info("Enabling C++ build-mode: none");
core.exportVariable(bmn_var, "true");
}
else {
logger.info("Disabling C++ build-mode: none");
core.exportVariable(bmn_var, "false");
}
const bmnVar = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
const value = process.env[bmnVar] || await features.getValue(feature_flags_1.Feature.CppBuildModeNone, codeql);
logger.info(`Setting C++ build-mode: none to ${value}`);
core.exportVariable(bmnVar, value);
}
// For CLI versions <2.15.1, build tracing caused errors in MacOS ARM machines with
// System Integrity Protection (SIP) disabled.

File diff suppressed because one or more lines are too long

View file

@ -548,16 +548,10 @@ async function run() {
// Set CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE
if (config.languages.includes(Language.cpp)) {
const bmn_var = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
if (process.env[bmn_var]) {
logger.info("CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE is already set");
} else if (await features.getValue(Feature.CppBuildModeNone, codeql)) {
logger.info("Enabling C++ build-mode: none");
core.exportVariable(bmn_var, "true");
} else {
logger.info("Disabling C++ build-mode: none");
core.exportVariable(bmn_var, "false");
}
const bmnVar = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
const value = process.env[bmnVar] || await features.getValue(Feature.CppBuildModeNone, codeql)
logger.info(`Setting C++ build-mode: none to ${value}`);
core.exportVariable(bmnVar, value);
}
// For CLI versions <2.15.1, build tracing caused errors in MacOS ARM machines with