Don't call trace-command when the indirect tracer has already been started
This commit is contained in:
parent
7d9b7a1870
commit
7a6352f8e6
9 changed files with 12 additions and 55 deletions
|
|
@ -173,7 +173,7 @@ export async function runAutobuild(
|
|||
) {
|
||||
await codeQL.extractUsingBuildMode(config, language);
|
||||
} else {
|
||||
await codeQL.runAutobuild(config, language, features);
|
||||
await codeQL.runAutobuild(config, language);
|
||||
}
|
||||
if (language === Language.go) {
|
||||
core.exportVariable(EnvVar.DID_AUTOBUILD_GOLANG, "true");
|
||||
|
|
|
|||
|
|
@ -910,12 +910,7 @@ test("runTool summarizes autobuilder errors", async (t) => {
|
|||
sinon.stub(safeWhich, "safeWhich").resolves("");
|
||||
|
||||
await t.throwsAsync(
|
||||
async () =>
|
||||
await codeqlObject.runAutobuild(
|
||||
stubConfig,
|
||||
Language.java,
|
||||
createFeatures([]),
|
||||
),
|
||||
async () => await codeqlObject.runAutobuild(stubConfig, Language.java),
|
||||
{
|
||||
instanceOf: CommandInvocationError,
|
||||
message:
|
||||
|
|
@ -943,12 +938,7 @@ test("runTool truncates long autobuilder errors", async (t) => {
|
|||
sinon.stub(safeWhich, "safeWhich").resolves("");
|
||||
|
||||
await t.throwsAsync(
|
||||
async () =>
|
||||
await codeqlObject.runAutobuild(
|
||||
stubConfig,
|
||||
Language.java,
|
||||
createFeatures([]),
|
||||
),
|
||||
async () => await codeqlObject.runAutobuild(stubConfig, Language.java),
|
||||
{
|
||||
instanceOf: CommandInvocationError,
|
||||
message:
|
||||
|
|
|
|||
|
|
@ -88,11 +88,7 @@ export interface CodeQL {
|
|||
/**
|
||||
* Runs the autobuilder for the given language.
|
||||
*/
|
||||
runAutobuild(
|
||||
config: Config,
|
||||
language: Language,
|
||||
features: FeatureEnablement,
|
||||
): Promise<void>;
|
||||
runAutobuild(config: Config, language: Language): Promise<void>;
|
||||
/**
|
||||
* Extract code for a scanned language using 'codeql database trace-command'
|
||||
* and running the language extractor.
|
||||
|
|
@ -634,27 +630,9 @@ export async function getCodeQLForCmd(
|
|||
{ stdin: externalRepositoryToken },
|
||||
);
|
||||
},
|
||||
async runAutobuild(
|
||||
config: Config,
|
||||
language: Language,
|
||||
features: FeatureEnablement,
|
||||
) {
|
||||
async runAutobuild(config: Config, language: Language) {
|
||||
applyAutobuildAzurePipelinesTimeoutFix();
|
||||
|
||||
if (
|
||||
await features.getValue(Feature.AutobuildDirectTracingEnabled, this)
|
||||
) {
|
||||
await runTool(cmd, [
|
||||
"database",
|
||||
"trace-command",
|
||||
...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
|
||||
...getExtractionVerbosityArguments(config.debugMode),
|
||||
...getExtraOptionsFromEnv(["database", "trace-command"]),
|
||||
util.getCodeQLDatabasePath(config, language),
|
||||
]);
|
||||
return;
|
||||
}
|
||||
|
||||
const autobuildCmd = path.join(
|
||||
await this.resolveExtractor(language),
|
||||
"tools",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue