Merge branch 'main' into robertbrignull/tools_version

github · Nov 18, 2020 · 0d960df · 0d960df
2 parents 1737b80 + 10b43b8
commit 0d960df
Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/init/action.yml b/init/action.yml
@@ -1,5 +1,5 @@
 name: 'CodeQL: Init'
-description: 'Setup the CodeQL tracer'
+description: 'Set up CodeQL'
 author: 'GitHub'
 inputs:
   tools:

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

diff --git a/src/runner.ts b/src/runner.ts
@@ -212,7 +212,7 @@ program
 
         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}" ` +
             `or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`
         );
@@ -229,7 +229,7 @@ program
 
         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}".`
         );
       }