Respect extra options in a few codeql calls

This commit is contained in:
Edoardo Pirovano 2022-01-21 13:44:52 +00:00
parent d76304cd8e
commit 14b4839253
No known key found for this signature in database
GPG key ID: 047556B5D93FFE28
3 changed files with 17 additions and 3 deletions

9
lib/codeql.js generated
View file

@ -512,7 +512,12 @@ async function getCodeQLForCmd(cmd, checkVersion) {
await (0, toolrunner_error_catcher_1.toolrunnerErrorCatcher)(cmd, args, error_matcher_1.errorMatchers);
},
async resolveLanguages() {
const codeqlArgs = ["resolve", "languages", "--format=json"];
const codeqlArgs = [
"resolve",
"languages",
"--format=json",
...getExtraOptionsFromEnv(["resolve", "languages"]),
];
const output = await runTool(cmd, codeqlArgs);
try {
return JSON.parse(output);
@ -635,6 +640,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
"cleanup",
databasePath,
`--mode=${cleanupLevel}`,
...getExtraOptionsFromEnv(["database", "cleanup"]),
];
await runTool(cmd, codeqlArgs);
},
@ -645,6 +651,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
databasePath,
`--output=${outputFilePath}`,
`--name=${databaseName}`,
...getExtraOptionsFromEnv(["database", "bundle"]),
];
await new toolrunner.ToolRunner(cmd, args).exec();
},

File diff suppressed because one or more lines are too long