robojerk/codeql-action

Respect extra options in a few codeql calls

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

2
lib/codeql.js.map
View file

File diff suppressed because one or more lines are too long

9
src/codeql.ts
View file

@ -805,7 +805,12 @@ async function getCodeQLForCmd(
await toolrunnerErrorCatcher(cmd, args, errorMatchers); await toolrunnerErrorCatcher(cmd, args, errorMatchers);
}, },
async resolveLanguages() { async resolveLanguages() {
const codeqlArgs = ["resolve", "languages", "--format=json"]; const codeqlArgs = [
"resolve",
"languages",
"--format=json",
...getExtraOptionsFromEnv(["resolve", "languages"]),
];
const output = await runTool(cmd, codeqlArgs); const output = await runTool(cmd, codeqlArgs);
try { try {
@ -956,6 +961,7 @@ async function getCodeQLForCmd(
"cleanup", "cleanup",
databasePath, databasePath,
`--mode=${cleanupLevel}`, `--mode=${cleanupLevel}`,
...getExtraOptionsFromEnv(["database", "cleanup"]),
]; ];
await runTool(cmd, codeqlArgs); await runTool(cmd, codeqlArgs);
}, },
@ -970,6 +976,7 @@ async function getCodeQLForCmd(
databasePath, databasePath,
`--output=${outputFilePath}`, `--output=${outputFilePath}`,
`--name=${databaseName}`, `--name=${databaseName}`,
...getExtraOptionsFromEnv(["database", "bundle"]),
]; ];
await new toolrunner.ToolRunner(cmd, args).exec(); await new toolrunner.ToolRunner(cmd, args).exec();
}, },