robojerk/codeql-action

Only echo command if we are streaming the stdout

Browse source
This commit is contained in:
Henry Mercer 2024-10-10 19:02:07 +01:00
parent 90c42c41ec
commit edd7713837
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/actions-util.js generated
View file

@ -468,7 +468,9 @@ const MAX_STDERR_BUFFER_SIZE = 20000;
async function runTool(cmd, args = [], opts = {}) {
let stdout = "";
let stderr = "";
process.stdout.write(`[command]${cmd} ${args.join(" ")}\n`);
if (!opts.noStreamStdout) {
process.stdout.write(`[command]${cmd} ${args.join(" ")}\n`);
}
const exitCode = await new toolrunner.ToolRunner(cmd, args, {
ignoreReturnCode: true,
listeners: {

2
lib/actions-util.js.map
View file

File diff suppressed because one or more lines are too long

2
lib/setup-codeql.js generated
View file

@ -405,7 +405,7 @@ const downloadCodeQL = async function (codeqlURL, maybeBundleVersion, maybeCliVe
const toolcacheVersion = getCanonicalToolcacheVersion(maybeCliVersion, bundleVersion, logger);
const toolcacheStart = performance.now();
const toolcachedBundlePath = await toolcache.cacheDir(extractedBundlePath, "CodeQL", toolcacheVersion);
logger.info(`Added CodeQL bundle to the tool cache (${performance.now() - toolcacheStart} ms).`);
logger.info(`Added CodeQL bundle to the tool cache (${Math.round(performance.now() - toolcacheStart)} ms).`);
// Defensive check: we expect `cacheDir` to copy the bundle to a new location.
if (toolcachedBundlePath !== extractedBundlePath) {
await (0, util_1.cleanUpGlob)(extractedBundlePath, "CodeQL bundle from temporary directory", logger);

2
lib/setup-codeql.js.map
View file

File diff suppressed because one or more lines are too long

4
src/actions-util.ts
View file

@ -527,7 +527,9 @@ export async function runTool(
): Promise<string> {
let stdout = "";
let stderr = "";
process.stdout.write(`[command]${cmd} ${args.join(" ")}\n`);
if (!opts.noStreamStdout) {
process.stdout.write(`[command]${cmd} ${args.join(" ")}\n`);
}
const exitCode = await new toolrunner.ToolRunner(cmd, args, {
ignoreReturnCode: true,
listeners: {

6
src/setup-codeql.ts
View file

@ -557,9 +557,9 @@ export const downloadCodeQL = async function (
);
logger.info(
`Added CodeQL bundle to the tool cache (${
performance.now() - toolcacheStart
} ms).`,
`Added CodeQL bundle to the tool cache (${Math.round(
performance.now() - toolcacheStart,
)} ms).`,
);
// Defensive check: we expect `cacheDir` to copy the bundle to a new location.