Merge branch 'main' into henrymercer/require-cli-2.6.3
This commit is contained in:
commit
1e2f8f035d
63 changed files with 728 additions and 505 deletions
|
|
@ -802,19 +802,12 @@ async function getCodeQLForCmd(
|
|||
sourceRoot: string,
|
||||
processName: string | undefined,
|
||||
processLevel: number | undefined,
|
||||
featureEnablement: FeatureEnablement,
|
||||
logger: Logger
|
||||
featureEnablement: FeatureEnablement
|
||||
) {
|
||||
const extraArgs = config.languages.map(
|
||||
(language) => `--language=${language}`
|
||||
);
|
||||
const isGoExtractionReconciliationEnabled =
|
||||
await util.isGoExtractionReconciliationEnabled(featureEnablement);
|
||||
if (
|
||||
config.languages.filter((l) =>
|
||||
isTracedLanguage(l, isGoExtractionReconciliationEnabled, logger)
|
||||
).length > 0
|
||||
) {
|
||||
if (config.languages.filter((l) => isTracedLanguage(l)).length > 0) {
|
||||
extraArgs.push("--begin-tracing");
|
||||
extraArgs.push(...(await getTrapCachingExtractorConfigArgs(config)));
|
||||
if (processName !== undefined) {
|
||||
|
|
@ -834,11 +827,7 @@ async function getCodeQLForCmd(
|
|||
CODEQL_VERSION_LUA_TRACER_CONFIG
|
||||
)) &&
|
||||
config.languages.includes(Language.go) &&
|
||||
isTracedLanguage(
|
||||
Language.go,
|
||||
isGoExtractionReconciliationEnabled,
|
||||
logger
|
||||
) &&
|
||||
isTracedLanguage(Language.go) &&
|
||||
process.platform === "win32" &&
|
||||
!(await util.codeQlVersionAbove(
|
||||
this,
|
||||
|
|
@ -871,8 +860,12 @@ async function getCodeQLForCmd(
|
|||
async runAutobuild(language: Language) {
|
||||
const cmdName =
|
||||
process.platform === "win32" ? "autobuild.cmd" : "autobuild.sh";
|
||||
// The autobuilder for Swift is located in the experimental/ directory.
|
||||
const possibleExperimentalDir =
|
||||
language === Language.swift ? "experimental" : "";
|
||||
const autobuildCmd = path.join(
|
||||
path.dirname(cmd),
|
||||
possibleExperimentalDir,
|
||||
language,
|
||||
"tools",
|
||||
cmdName
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue