diff --git a/action.yml b/action.yml index cb9b529..f5c5489 100644 --- a/action.yml +++ b/action.yml @@ -10,10 +10,8 @@ inputs: default: master extra_plugins: description: 'Extra plugins for pre-install' - default: '' dry_run: description: 'Whether to run semantic release in "dry-run" mode. It will override the dryRun attribute in your configuration file' - default: '' outputs: new_release_published: description: 'Whether a new release was published' diff --git a/src/handleOptions.js b/src/handleOptions.js index 0dfe7c5..393c19a 100644 --- a/src/handleOptions.js +++ b/src/handleOptions.js @@ -6,7 +6,7 @@ const inputs = require('./inputs.json'); * @returns {{}|{dryRun: boolean}} */ exports.handleDryRunOption = () => { - const dryRun = core.getInput(inputs.dry_run, {required: false}) || ''; + const dryRun = core.getInput(inputs.dry_run); switch (dryRun) { case 'true': diff --git a/src/index.js b/src/index.js index 3b8bc5b..e1a4b5c 100644 --- a/src/index.js +++ b/src/index.js @@ -16,7 +16,7 @@ const release = async () => { await setUpJob(); await preInstallPlugins(); - const branch = core.getInput(inputs.branch, {required: false}) || 'master'; + const branch = core.getInput(inputs.branch) || 'master'; const result = await semanticRelease({ branch, ...(handleDryRunOption()), diff --git a/src/preInstallPlugins.task.js b/src/preInstallPlugins.task.js index b0ea0a9..686fbb3 100644 --- a/src/preInstallPlugins.task.js +++ b/src/preInstallPlugins.task.js @@ -1,26 +1,29 @@ const path = require('path'); const core = require('@actions/core'); const exec = require('./_exec'); +const inputs = require('./inputs.json'); /** * Pre-install plugins - * @returns {Promise} + * @returns {Promise} */ module.exports = async () => { - const extraPlugins = core.getInput('extra_plugins', {required: false}) || ''; + const extraPlugins = core.getInput(inputs.extra_plugins); - if (extraPlugins) { - const _extraPlugins = extraPlugins - .replace(/['"]/g, '') - .replace(/[\n\r]/g, ' '); + if (!extraPlugins) { + return Promise.resolve(); + } - const {stdout, stderr} = await exec(`npm install ${_extraPlugins}`, { - cwd: path.resolve(__dirname) - }); - core.debug(stdout); + const _extraPlugins = extraPlugins + .replace(/['"]/g, '') + .replace(/[\n\r]/g, ' '); - if (stderr) { - return Promise.reject(stderr); - } + const {stdout, stderr} = await exec(`npm install ${_extraPlugins}`, { + cwd: path.resolve(__dirname) + }); + core.debug(stdout); + + if (stderr) { + return Promise.reject(stderr); } };