Merge pull request #61 from crazy-max/exec-output

Use built-in getExecOutput
docker · Oct 8, 2022 · 8c1e35a · 8c1e35a
2 parents aa08745 + f3c51a3
commit 8c1e35a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 64 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ ___
 * [Usage](#usage)
 * [Customizing](#customizing)
   * [inputs](#inputs)
-* [Keep up-to-date with GitHub Dependabot](#keep-up-to-date-with-github-dependabot)
+* [Contributing](#contributing)
 
 ## Usage
 
@@ -38,10 +38,10 @@ jobs:
 
 Following inputs can be used as `step.with` keys
 
-| Name             | Type    | Description                        |
-|------------------|---------|------------------------------------|
-| `image`          | String  | QEMU static binaries Docker image (default [`tonistiigi/binfmt:latest`](https://hub.docker.com/r/tonistiigi/binfmt/tags)) |
-| `platforms`      | String  | Platforms to install (e.g. `arm64,riscv64,arm` ; default `all`) |
+| Name        | Type   | Description                                                                                                               |
+|-------------|--------|---------------------------------------------------------------------------------------------------------------------------|
+| `image`     | String | QEMU static binaries Docker image (default [`tonistiigi/binfmt:latest`](https://hub.docker.com/r/tonistiigi/binfmt/tags)) |
+| `platforms` | String | Platforms to install (e.g. `arm64,riscv64,arm` ; default `all`)                                                           |
 
 ### outputs
 
@@ -51,18 +51,7 @@ Following outputs are available
 |---------------|---------|---------------------------------------|
 | `platforms`   | String  | Available platforms (comma separated) |
 
-## Keep up-to-date with GitHub Dependabot
+## Contributing
 
-Since [Dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot)
-has [native GitHub Actions support](https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#package-ecosystem),
-to enable it on your GitHub repo all you need to do is add the `.github/dependabot.yml` file:
-
-```yaml
-version: 2
-updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-```
+Want to contribute? Awesome! You can find information about contributing to
+this project in the [CONTRIBUTING.md](/.github/CONTRIBUTING.md)
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);