Merge branch 'main' into robertbrignull/tools_version

This commit is contained in:
Robert 2020-11-18 11:25:46 +00:00
commit 0d960df08a
7 changed files with 9 additions and 7 deletions

View file

@ -1,5 +1,5 @@
name: 'CodeQL: Init' name: 'CodeQL: Init'
description: 'Setup the CodeQL tracer' description: 'Set up CodeQL'
author: 'GitHub' author: 'GitHub'
inputs: inputs:
tools: tools:

1
lib/codeql.js generated
View file

@ -406,6 +406,7 @@ function getCodeQLForCmd(cmd) {
databasePath, databasePath,
"--min-disk-free=1024", "--min-disk-free=1024",
"--format=sarif-latest", "--format=sarif-latest",
"--sarif-multicause-markdown",
`--output=${sarifFile}`, `--output=${sarifFile}`,
addSnippetsFlag, addSnippetsFlag,
...getExtraOptionsFromEnv(["database", "analyze"]), ...getExtraOptionsFromEnv(["database", "analyze"]),

File diff suppressed because one or more lines are too long

4
lib/runner.js generated
View file

@ -133,7 +133,7 @@ program
.join("\n"); .join("\n");
fs.writeFileSync(powershellEnvFile, powershellEnvFileContents); fs.writeFileSync(powershellEnvFile, powershellEnvFileContents);
logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFile}" and "${powershellEnvFile}". ` + logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFile}" and "${powershellEnvFile}". ` +
`Please export these variables to future processes so the build can be traced. ` + `Please export these variables to future processes so that CodeQL can monitor the build. ` +
`If using cmd/batch run "call ${batEnvFile}" ` + `If using cmd/batch run "call ${batEnvFile}" ` +
`or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`); `or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`);
} }
@ -146,7 +146,7 @@ program
.join("\n"); .join("\n");
fs.writeFileSync(shEnvFile, shEnvFileContents); fs.writeFileSync(shEnvFile, shEnvFileContents);
logger.info(`\nCodeQL environment output to "${jsonEnvFile}" and "${shEnvFile}". ` + logger.info(`\nCodeQL environment output to "${jsonEnvFile}" and "${shEnvFile}". ` +
`Please export these variables to future processes so the build can be traced, ` + `Please export these variables to future processes so that CodeQL can monitor the build, ` +
`for example by running ". ${shEnvFile}".`); `for example by running ". ${shEnvFile}".`);
} }
} }

File diff suppressed because one or more lines are too long

View file

@ -618,6 +618,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
databasePath, databasePath,
"--min-disk-free=1024", // Try to leave at least 1GB free "--min-disk-free=1024", // Try to leave at least 1GB free
"--format=sarif-latest", "--format=sarif-latest",
"--sarif-multicause-markdown",
`--output=${sarifFile}`, `--output=${sarifFile}`,
addSnippetsFlag, addSnippetsFlag,
...getExtraOptionsFromEnv(["database", "analyze"]), ...getExtraOptionsFromEnv(["database", "analyze"]),

View file

@ -212,7 +212,7 @@ program
logger.info( logger.info(
`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFile}" and "${powershellEnvFile}". ` + `\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFile}" and "${powershellEnvFile}". ` +
`Please export these variables to future processes so the build can be traced. ` + `Please export these variables to future processes so that CodeQL can monitor the build. ` +
`If using cmd/batch run "call ${batEnvFile}" ` + `If using cmd/batch run "call ${batEnvFile}" ` +
`or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".` `or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`
); );
@ -229,7 +229,7 @@ program
logger.info( logger.info(
`\nCodeQL environment output to "${jsonEnvFile}" and "${shEnvFile}". ` + `\nCodeQL environment output to "${jsonEnvFile}" and "${shEnvFile}". ` +
`Please export these variables to future processes so the build can be traced, ` + `Please export these variables to future processes so that CodeQL can monitor the build, ` +
`for example by running ". ${shEnvFile}".` `for example by running ". ${shEnvFile}".`
); );
} }