From 1765b1e3108c84ebed5f765f5dca20be89db0683 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:59:01 +0200 Subject: [PATCH] throw error message instead of exit code Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- src/main.ts | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main.ts b/src/main.ts index 0026eec..7210643 100644 --- a/src/main.ts +++ b/src/main.ts @@ -20,15 +20,33 @@ actionsToolkit.run( }); await core.group(`Pulling binfmt Docker image`, async () => { - await Exec.exec('docker', ['pull', input.image]); + await Exec.getExecOutput('docker', ['pull', input.image], { + ignoreReturnCode: true + }).then(res => { + if (res.stderr.length > 0 && res.exitCode != 0) { + throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); + } + }); }); await core.group(`Image info`, async () => { - await Exec.exec('docker', ['image', 'inspect', input.image]); + await Exec.getExecOutput('docker', ['image', 'inspect', input.image], { + ignoreReturnCode: true + }).then(res => { + if (res.stderr.length > 0 && res.exitCode != 0) { + throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); + } + }); }); await core.group(`Installing QEMU static binaries`, async () => { - await Exec.exec('docker', ['run', '--rm', '--privileged', input.image, '--install', input.platforms]); + await Exec.getExecOutput('docker', ['run', '--rm', '--privileged', input.image, '--install', input.platforms], { + ignoreReturnCode: true + }).then(res => { + if (res.stderr.length > 0 && res.exitCode != 0) { + throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); + } + }); }); await core.group(`Extracting available platforms`, async () => { @@ -37,7 +55,7 @@ actionsToolkit.run( silent: true }).then(res => { if (res.stderr.length > 0 && res.exitCode != 0) { - throw new Error(res.stderr.trim()); + throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); } const platforms: Platforms = JSON.parse(res.stdout.trim()); core.info(`${platforms.supported.join(',')}`);