From 3b300469c5614dc6ca1b633e1bd8928cb50908e8 Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Sat, 22 May 2021 08:59:32 +0900 Subject: [PATCH 1/3] use core.getBooleanInput instead of original one --- package-lock.json | 15 ++++++++------- package.json | 2 +- src/setup-redis.ts | 38 ++++---------------------------------- 3 files changed, 13 insertions(+), 42 deletions(-) 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..c03dff59 100644 --- a/src/setup-redis.ts +++ b/src/setup-redis.ts @@ -4,19 +4,12 @@ import * as starter from './starter'; async function run() { try { - const version = core.getInput('redis-version', { - required: true - }); + const required = { required: true}; + const version = core.getInput('redis-version', required); const port = parseInt( - core.getInput('redis-port', { - required: true - }) - ); - const autoStart = parseBoolean( - core.getInput('auto-start', { - required: true - }) + 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 +25,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(); From 2252e3e0f5b146f481c230b0dd94a23f7aa2fb08 Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Sat, 22 May 2021 09:06:11 +0900 Subject: [PATCH 2/3] fix the default value of `auto-start` --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From ddea021fbea9dec199eb2aaacd166445d39665de Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Sat, 22 May 2021 11:08:34 +0900 Subject: [PATCH 3/3] format --- src/setup-redis.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/setup-redis.ts b/src/setup-redis.ts index c03dff59..77f11e96 100644 --- a/src/setup-redis.ts +++ b/src/setup-redis.ts @@ -4,11 +4,9 @@ import * as starter from './starter'; async function run() { try { - const required = { required: true}; + const required = {required: true}; const version = core.getInput('redis-version', required); - const port = parseInt( - core.getInput('redis-port', required) - ); + const port = parseInt(core.getInput('redis-port', required)); const autoStart = core.getBooleanInput('auto-start', required); const redisPath = await core.group('install redis', async () => {