diff --git a/action.yml b/action.yml index 77da1cd2..eb238157 100644 --- a/action.yml +++ b/action.yml @@ -12,7 +12,7 @@ inputs: required: true auto-start: description: enable to auto-start redis-sever - default: "yes" + default: "true" required: true runs: using: 'node12' diff --git a/package-lock.json b/package-lock.json index db48dac1..480b6598 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "0.0.0", "license": "MIT", "dependencies": { - "@actions/core": "^1.2.7", + "@actions/core": "^1.3.0", "@actions/exec": "^1.0.4", "@actions/io": "^1.1.0", "@actions/tool-cache": "^1.6.1", @@ -28,9 +28,10 @@ } }, "node_modules/@actions/core": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.7.tgz", - "integrity": "sha512-kzLFD5BgEvq6ubcxdgPbRKGD2Qrgya/5j+wh4LZzqT915I0V3rED+MvjH6NXghbvk1MXknpNNQ3uKjXSEN00Ig==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.3.0.tgz", + "integrity": "sha512-xxtX0Cwdhb8LcgatfJkokqT8KzPvcIbwL9xpLU09nOwBzaStbfm0dNncsP0M4us+EpoPdWy7vbzU5vSOH7K6pg==", + "license": "MIT" }, "node_modules/@actions/exec": { "version": "1.0.4", @@ -6135,9 +6136,9 @@ }, "dependencies": { "@actions/core": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.7.tgz", - "integrity": "sha512-kzLFD5BgEvq6ubcxdgPbRKGD2Qrgya/5j+wh4LZzqT915I0V3rED+MvjH6NXghbvk1MXknpNNQ3uKjXSEN00Ig==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.3.0.tgz", + "integrity": "sha512-xxtX0Cwdhb8LcgatfJkokqT8KzPvcIbwL9xpLU09nOwBzaStbfm0dNncsP0M4us+EpoPdWy7vbzU5vSOH7K6pg==" }, "@actions/exec": { "version": "1.0.4", diff --git a/package.json b/package.json index 551528d1..911164eb 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "author": "Ichinose Shogo", "license": "MIT", "dependencies": { - "@actions/core": "^1.2.7", + "@actions/core": "^1.3.0", "@actions/exec": "^1.0.4", "@actions/io": "^1.1.0", "@actions/tool-cache": "^1.6.1", diff --git a/src/setup-redis.ts b/src/setup-redis.ts index 085503ca..77f11e96 100644 --- a/src/setup-redis.ts +++ b/src/setup-redis.ts @@ -4,19 +4,10 @@ import * as starter from './starter'; async function run() { try { - const version = core.getInput('redis-version', { - required: true - }); - const port = parseInt( - core.getInput('redis-port', { - required: true - }) - ); - const autoStart = parseBoolean( - core.getInput('auto-start', { - required: true - }) - ); + const required = {required: true}; + const version = core.getInput('redis-version', required); + const port = parseInt(core.getInput('redis-port', required)); + const autoStart = core.getBooleanInput('auto-start', required); const redisPath = await core.group('install redis', async () => { return installer.getRedis(version); @@ -32,27 +23,4 @@ async function run() { } } -function parseBoolean(s: string): boolean { - switch (s) { - case 'y': - case 'Y': - case 'yes': - case 'Yes': - case 'YES': - case 'true': - case 'True': - case 'TRUE': - return true; - case 'n': - case 'N': - case 'no': - case 'No': - case 'NO': - case 'false': - case 'False': - case 'FALSE': - return false; - } - throw `invalid boolean value: ${s}`; -} run();