Merge remote-tracking branch 'upstream/main' into aeisenberg/ghes-pack-download

This commit is contained in:
Andrew Eisenberg
2022-09-06 10:22:00 -07:00
214 changed files with 3225 additions and 2419 deletions

View File

@@ -781,8 +781,12 @@ async function getCodeQLForCmd(
const extraArgs = config.languages.map(
(language) => `--language=${language}`
);
const isGoExtractionReconciliationEnabled =
await util.isGoExtractionReconciliationEnabled(featureFlags);
if (
config.languages.filter((l) => isTracedLanguage(l, logger)).length > 0
config.languages.filter((l) =>
isTracedLanguage(l, isGoExtractionReconciliationEnabled, logger)
).length > 0
) {
extraArgs.push("--begin-tracing");
extraArgs.push(...(await getTrapCachingExtractorConfigArgs(config)));
@@ -803,7 +807,11 @@ async function getCodeQLForCmd(
// `CODEQL_VERSION_LUA_TRACING_GO_WINDOWS_FIXED`, so don't use Lua tracing
// when tracing Go on Windows on these CodeQL versions.
(!config.languages.includes(Language.go) ||
!isTracedLanguage(Language.go, logger) ||
!isTracedLanguage(
Language.go,
isGoExtractionReconciliationEnabled,
logger
) ||
process.platform !== "win32" ||
(await util.codeQlVersionAbove(
this,