Merge pull request #27 from crazy-max/bool-input

Use `core.getBooleanInput`

.github/workflows/ci.yml

@@ -56,7 +56,27 @@ jobs:
         if: always()
         uses: crazy-max/ghaction-dump-context@v1
 
-  error:
+  error-msg:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Build
+        continue-on-error: true
+        uses: ./
+        with:
+          files: |
+            ./test/config.hcl
+          set: |
+            *.platform=linux/amd64,linux/ppc64le,linux/s390x
+      -
+        name: Dump context
+        if: always()
+        uses: crazy-max/ghaction-dump-context@v1
+
+  error-check:
     runs-on: ubuntu-latest
     steps:
       -

README.md

@@ -14,6 +14,8 @@ of  this action in your workflow (i.e `docker/bake-action@v1.1.3`).
 GitHub Action to use Docker [Buildx Bake](https://github.com/docker/buildx/blob/master/docs/reference/buildx_bake.md)
 as a high-level build command.
 
+![Screenshot](.github/bake-action.png)
+
 ___
 
 * [Usage](#usage)

__tests__/context.test.ts

@@ -188,7 +188,7 @@ describe('setOutput', () => {
   });
 });
 
-// See: https://github.com/actions/toolkit/blob/master/packages/core/src/core.ts#L67
+// See: https://github.com/actions/toolkit/blob/a1b068ec31a042ff1e10a522d8fdf0b8869d53ca/packages/core/src/core.ts#L89
 function getInputName(name: string): string {
   return `INPUT_${name.replace(/ /g, '_').toUpperCase()}`;
 }

dist/index.js

@@ -518,6 +518,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const buildx = __importStar(__webpack_require__(295));
 const context = __importStar(__webpack_require__(842));
+const mexec = __importStar(__webpack_require__(757));
 const core = __importStar(__webpack_require__(186));
 const exec = __importStar(__webpack_require__(514));
 function run() {
@@ -531,15 +532,17 @@ function run() {
                 core.setFailed(`Docker buildx is required. See https://github.com/docker/setup-buildx-action to set up buildx.`);
                 return;
             }
-            const buildxVersion = yield buildx.getVersion();
+            const bxVersion = yield buildx.getVersion();
-            core.info(`Using buildx ${buildxVersion}`);
+            const inputs = yield context.getInputs();
-            let inputs = yield context.getInputs();
+            const args = yield context.getArgs(inputs, bxVersion);
-            const args = yield context.getArgs(inputs, buildxVersion);
             core.startGroup(`Bake definition`);
             yield exec.exec('docker', [...args, '--print']);
             core.endGroup();
-            core.info(`Building...`);
+            yield mexec.exec('docker', args).then(res => {
-            yield exec.exec('docker', args);
+                if (res.stderr.length > 0 && !res.success) {
+                    throw new Error(`buildx bake failed with: ${res.stderr.match(/(.*)\s*$/)[0]}`);
+                }
+            });
         }
         catch (error) {
             core.setFailed(error.message);
@@ -1596,6 +1599,25 @@ module.exports = minVersion
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -1605,14 +1627,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0;
 const command_1 = __webpack_require__(241);
 const file_command_1 = __webpack_require__(717);
 const utils_1 = __webpack_require__(278);
@@ -1679,7 +1695,9 @@ function addPath(inputPath) {
 }
 exports.addPath = addPath;
 /**
- * Gets the value of an input.  The value is also trimmed.
+ * Gets the value of an input.
+ * Unless trimWhitespace is set to false in InputOptions, the value is also trimmed.
+ * Returns an empty string if the value is not defined.
  *
  * @param     name     name of the input to get
  * @param     options  optional. See InputOptions.
@@ -1690,9 +1708,34 @@ function getInput(name, options) {
     if (options && options.required && !val) {
         throw new Error(`Input required and not supplied: ${name}`);
     }
+    if (options && options.trimWhitespace === false) {
+        return val;
+    }
     return val.trim();
 }
 exports.getInput = getInput;
+/**
+ * Gets the input value of the boolean type in the YAML 1.2 "core schema" specification.
+ * Support boolean input list: `true | True | TRUE | false | False | FALSE` .
+ * The return value is also in boolean type.
+ * ref: https://yaml.org/spec/1.2/spec.html#id2804923
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   boolean
+ */
+function getBooleanInput(name, options) {
+    const trueValue = ['true', 'True', 'TRUE'];
+    const falseValue = ['false', 'False', 'FALSE'];
+    const val = getInput(name, options);
+    if (trueValue.includes(val))
+        return true;
+    if (falseValue.includes(val))
+        return false;
+    throw new TypeError(`Input does not meet YAML 1.2 "Core Schema" specification: ${name}\n` +
+        `Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
+}
+exports.getBooleanInput = getBooleanInput;
 /**
  * Sets the value of an output.
  *
@@ -1852,14 +1895,27 @@ module.exports = lt
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    result["default"] = mod;
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.issue = exports.issueCommand = void 0;
 const os = __importStar(__webpack_require__(87));
 const utils_1 = __webpack_require__(278);
 /**
@@ -1941,6 +1997,7 @@ function escapeProperty(s) {
 // We use any as a valid input type
 /* eslint-disable @typescript-eslint/no-explicit-any */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toCommandValue = void 0;
 /**
  * Sanitizes an input into a string so it can be passed into issueCommand safely
  * @param input input to sanitize into a string
@@ -3701,14 +3758,27 @@ module.exports = toComparators
 "use strict";
 
 // For internal use, subject to change.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    result["default"] = mod;
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.issueCommand = void 0;
 // We use any as a valid input type
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const fs = __importStar(__webpack_require__(747));
@@ -5726,10 +5796,10 @@ function getInputs() {
             builder: core.getInput('builder'),
             files: getInputList('files'),
             targets: getInputList('targets'),
-            noCache: /true/i.test(core.getInput('no-cache')),
+            noCache: core.getBooleanInput('no-cache'),
-            pull: /true/i.test(core.getInput('pull')),
+            pull: core.getBooleanInput('pull'),
-            load: /true/i.test(core.getInput('load')),
+            load: core.getBooleanInput('load'),
-            push: /true/i.test(core.getInput('push')),
+            push: core.getBooleanInput('push'),
             set: getInputList('set', true)
         };
     });

package.json

@@ -28,7 +28,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@actions/core": "^1.2.7",
+    "@actions/core": "^1.3.0",
     "@actions/exec": "^1.0.4",
     "csv-parse": "^4.15.4",
     "semver": "^7.3.5"

src/context.ts

@@ -19,10 +19,10 @@ export async function getInputs(): Promise<Inputs> {
     builder: core.getInput('builder'),
     files: getInputList('files'),
     targets: getInputList('targets'),
-    noCache: /true/i.test(core.getInput('no-cache')),
+    noCache: core.getBooleanInput('no-cache'),
-    pull: /true/i.test(core.getInput('pull')),
+    pull: core.getBooleanInput('pull'),
-    load: /true/i.test(core.getInput('load')),
+    load: core.getBooleanInput('load'),
-    push: /true/i.test(core.getInput('push')),
+    push: core.getBooleanInput('push'),
     set: getInputList('set', true)
   };
 }

src/exec.ts

@@ -7,7 +7,7 @@ export interface ExecResult {
   stderr: string;
 }
 
-export const exec = async (command: string, args: string[] = [], silent: boolean): Promise<ExecResult> => {
+export const exec = async (command: string, args: string[] = [], silent?: boolean): Promise<ExecResult> => {
   let stdout: string = '';
   let stderr: string = '';
 

src/main.ts

@@ -1,5 +1,6 @@
 import * as buildx from './buildx';
 import * as context from './context';
+import * as mexec from './exec';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 
@@ -15,18 +16,19 @@ async function run(): Promise<void> {
       return;
     }
 
-    const buildxVersion = await buildx.getVersion();
+    const bxVersion = await buildx.getVersion();
-    core.info(`Using buildx ${buildxVersion}`);
+    const inputs: context.Inputs = await context.getInputs();
-
+    const args: string[] = await context.getArgs(inputs, bxVersion);
-    let inputs: context.Inputs = await context.getInputs();
-    const args: string[] = await context.getArgs(inputs, buildxVersion);
 
     core.startGroup(`Bake definition`);
     await exec.exec('docker', [...args, '--print']);
     core.endGroup();
 
-    core.info(`Building...`);
+    await mexec.exec('docker', args).then(res => {
-    await exec.exec('docker', args);
+      if (res.stderr.length > 0 && !res.success) {
+        throw new Error(`buildx bake failed with: ${res.stderr.match(/(.*)\s*$/)![0]}`);
+      }
+    });
   } catch (error) {
     core.setFailed(error.message);
   }

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@actions/core@^1.2.7":
+"@actions/core@^1.3.0":
-  version "1.2.7"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.2.7.tgz#594f8c45b213f0146e4be7eda8ae5cf4e198e5ab"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.3.0.tgz#f5e4b24c889e7f2e58b466cc8c7481292284eba0"
-  integrity sha512-kzLFD5BgEvq6ubcxdgPbRKGD2Qrgya/5j+wh4LZzqT915I0V3rED+MvjH6NXghbvk1MXknpNNQ3uKjXSEN00Ig==
+  integrity sha512-xxtX0Cwdhb8LcgatfJkokqT8KzPvcIbwL9xpLU09nOwBzaStbfm0dNncsP0M4us+EpoPdWy7vbzU5vSOH7K6pg==
 
 "@actions/exec@^1.0.4":
   version "1.0.4"