Merge branch 'main' into windows_tracing

github · Sep 7, 2020 · 212f448 · 212f448
2 parents 694fa2d + 556aed4
commit 212f448
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
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
@@ -227,6 +227,7 @@ export async function setupCodeQL(
       } else {
         logger.debug('Downloading CodeQL bundle without token.');
       }
+      logger.info(`Downloading CodeQL tools from ${codeqlURL}. This may take a while.`);
       let codeqlPath = await toolcacheDownloadTool(codeqlURL, headers, tempDir, logger);
       logger.debug(`CodeQL bundle download to ${codeqlPath} complete.`);
 

diff --git a/src/runner.ts b/src/runner.ts
@@ -197,9 +197,9 @@ program
           .join('\n');
         fs.writeFileSync(powershellEnvFile, powershellEnvFileContents);
 
-        logger.info(`\nCodeQL environment output to "${jsonEnvFile}", "${batEnvFileContents}" 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. ` +
-          `If using cmd/batch run "call ${batEnvFileContents}" ` +
+          `If using cmd/batch run "call ${batEnvFile}" ` +
           `or if using PowerShell run "cat ${powershellEnvFile} | Invoke-Expression".`);
 
       } else {