Use built-in getExecOutput

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Oct 8, 2022 · c47ad32 · c47ad32
1 parent aa08745
commit c47ad32
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 45 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/exec.ts b/src/exec.ts
diff --git a/src/main.ts b/src/main.ts
@@ -1,4 +1,3 @@
-import * as mexec from './exec';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import {issueCommand} from '@actions/core/lib/command';
@@ -31,14 +30,19 @@ async function run(): Promise<void> {
     core.endGroup();
 
     core.startGroup(`Extracting available platforms`);
-    await mexec.exec(`docker`, ['run', '--rm', '--privileged', image], true).then(res => {
-      if (res.stderr != '' && !res.success) {
-        throw new Error(res.stderr);
-      }
-      const platforms: Platforms = JSON.parse(res.stdout.trim());
-      core.info(`${platforms.supported.join(',')}`);
-      setOutput('platforms', platforms.supported.join(','));
-    });
+    await exec
+      .getExecOutput('docker', ['run', '--rm', '--privileged', image], {
+        ignoreReturnCode: true,
+        silent: true
+      })
+      .then(res => {
+        if (res.stderr.length > 0 && res.exitCode != 0) {
+          throw new Error(res.stderr.trim());
+        }
+        const platforms: Platforms = JSON.parse(res.stdout.trim());
+        core.info(`${platforms.supported.join(',')}`);
+        setOutput('platforms', platforms.supported.join(','));
+      });
     core.endGroup();
   } catch (error) {
     core.setFailed(error.message);