build v1.12.1

shogo82148 · May 21, 2021 · 9197643 · 9197643
1 parent 1196426
commit 9197643
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -180,8 +180,8 @@ async function installWithCpanm(opt) {
     if (await exists(path.join(workingDirectory, 'cpanfile'))) {
         await exec.exec(perl, [...args, '--installdeps', '.'], execOpt);
     }
-    if (opt.install_modules) {
-        const modules = opt.install_modules.split('\n').map(s => s.trim());
+    const modules = splitModules(opt.install_modules);
+    if (modules.length > 0) {
         await exec.exec(perl, [...args, ...modules], execOpt);
     }
 }
@@ -201,8 +201,8 @@ async function installWithCpm(opt) {
         (await exists(path.join(workingDirectory, 'cpanfile.snapshot')))) {
         await exec.exec(perl, [...args], execOpt);
     }
-    if (opt.install_modules) {
-        const modules = opt.install_modules.split('\n').map(s => s.trim());
+    const modules = splitModules(opt.install_modules);
+    if (modules.length > 0) {
         await exec.exec(perl, [...args, ...modules], execOpt);
     }
 }
@@ -219,9 +219,9 @@ async function installWithCarton(opt) {
         (await exists(path.join(workingDirectory, 'cpanfile.snapshot')))) {
         await exec.exec(perl, [...args], execOpt);
     }
-    if (opt.install_modules) {
+    const modules = splitModules(opt.install_modules);
+    if (modules.length > 0) {
         const cpanm = path.join(__dirname, '..', 'bin', 'cpanm');
-        const modules = opt.install_modules.split('\n').map(s => s.trim());
         const args = [cpanm, '--local-lib-contained', 'local', '--notest'];
         if (core.isDebug()) {
             args.push('--verbose');
@@ -255,6 +255,16 @@ function splitArgs(args) {
     }
     return args.split(/\s+/);
 }
+function splitModules(modules) {
+    if (!modules) {
+        return [];
+    }
+    modules = modules.trim();
+    if (modules === '') {
+        return [];
+    }
+    return modules.split(/\s+/);
+}
 
 
 /***/ }),

diff --git a/dist/index.js.map b/dist/index.js.map