Merge branch 'main' into nickfyson/error_wrapper

# Conflicts:
#	lib/codeql.js.map
This commit is contained in:
Nick Fyson 2020-09-11 19:04:05 +01:00
commit b104d6e035
45 changed files with 1078 additions and 210 deletions

4
lib/codeql.js generated
View file

@ -346,7 +346,7 @@ function getCodeQLForCmd(cmd) {
}).exec();
return JSON.parse(output);
},
databaseAnalyze: async function (databasePath, sarifFile, querySuite, memoryFlag, threadsFlag) {
databaseAnalyze: async function (databasePath, sarifFile, querySuite, memoryFlag, addSnippetsFlag, threadsFlag) {
await new toolrunnner.ToolRunner(cmd, [
'database',
'analyze',
@ -355,7 +355,7 @@ function getCodeQLForCmd(cmd) {
databasePath,
'--format=sarif-latest',
'--output=' + sarifFile,
'--no-sarif-add-snippets',
addSnippetsFlag,
...getExtraOptionsFromEnv(['database', 'analyze']),
querySuite
]).exec();