Skip to content

Commit 0d960df

Browse files
Merge branch 'main' into robertbrignull/tools_version
2 parents 1737b80 + 10b43b8 commit 0d960df

7 files changed

Lines changed: 9 additions & 7 deletions

File tree

init/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'CodeQL: Init'
2-
description: 'Setup the CodeQL tracer'
2+
description: 'Set up CodeQL'
33
author: 'GitHub'
44
inputs:
55
tools:

lib/codeql.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/runner.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/runner.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/codeql.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
618618
databasePath,
619619
"--min-disk-free=1024", // Try to leave at least 1GB free
620620
"--format=sarif-latest",
621+
"--sarif-multicause-markdown",
621622
`--output=${sarifFile}`,
622623
addSnippetsFlag,
623624
...getExtraOptionsFromEnv(["database", "analyze"]),

src/runner.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ program
212212

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

230230
logger.info(
231231
`\nCodeQL environment output to "${jsonEnvFile}" and "${shEnvFile}". ` +
232-
`Please export these variables to future processes so the build can be traced, ` +
232+
`Please export these variables to future processes so that CodeQL can monitor the build, ` +
233233
`for example by running ". ${shEnvFile}".`
234234
);
235235
}

0 commit comments

Comments
 (0)