Vallie Joseph 2 жил өмнө
parent
commit
34070387ee
3 өөрчлөгдсөн 8 нэмэгдсэн , 11 устгасан
  1. 5 8
      dist/index.js
  2. 2 2
      package-lock.json
  3. 1 1
      package.json

+ 5 - 8
dist/index.js

@@ -133,6 +133,7 @@ const childProcess = __importStar(__webpack_require__(129));
 const path = __importStar(__webpack_require__(622));
 const util_1 = __webpack_require__(669);
 const ioUtil = __importStar(__webpack_require__(672));
+const exec = util_1.promisify(childProcess.exec);
 const execFile = util_1.promisify(childProcess.execFile);
 /**
  * Copies a file or folder.
@@ -224,17 +225,13 @@ function rmRF(inputPath) {
             try {
                 const cmdPath = ioUtil.getCmdPath();
                 if (yield ioUtil.isDirectory(inputPath, true)) {
-                    yield execFile(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, {
+                    yield exec(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, {
                         env: { inputPath }
-                    }).catch(error => {
-                        throw new Error(`Failed to remove directory: ${error.message}`);
                     });
                 }
                 else {
-                    yield execFile(`${cmdPath} /s /c "del /f /a "%inputPath%""`, {
+                    yield exec(`${cmdPath} /s /c "del /f /a "%inputPath%""`, {
                         env: { inputPath }
-                    }).catch(error => {
-                        throw new Error(`Failed to remove directory: ${error.message}`);
                     });
                 }
             }
@@ -246,7 +243,7 @@ function rmRF(inputPath) {
             }
             // Shelling out fails to remove a symlink folder with missing source, this unlink catches that
             try {
-                yield ioUtil.unlink(ioUtil.normalizeSeparators(inputPath));
+                yield ioUtil.unlink(inputPath);
             }
             catch (err) {
                 // if you try to delete a file that doesn't exist, desired result is achieved
@@ -427,7 +424,7 @@ function copyFile(srcFile, destFile, force) {
                 // Try to override file permission
                 if (e.code === 'EPERM') {
                     yield ioUtil.chmod(destFile, '0666');
-                    yield ioUtil.rmdir(destFile);
+                    yield ioUtil.unlink(destFile);
                 }
                 // other errors = it doesn't exist, no work to do
             }

+ 2 - 2
package-lock.json

@@ -59,8 +59,8 @@
       }
     },
     "@actions/io": {
-      "version": "file:actions-io-1.1.4.tgz",
-      "integrity": "sha512-JM4u7MrkRNjgr8wveZbtihhESfGR6lfV819G1yLWVF1yIhoVkRpVElv28kYFvrh8iU0rWE6VmrOHuZPpspGlcQ=="
+      "version": "file:actions-io-1.1.3.tgz",
+      "integrity": "sha512-GJsPQzUKCnXjTYzTIyA0lfY3vpTCrD2+YyyQEq7WakKF5c7YPR2Ox3PjMnPrSWvseAkEOXz1ZfcidXN7EqLn5w=="
     },
     "@actions/tool-cache": {
       "version": "1.1.2",

+ 1 - 1
package.json

@@ -32,7 +32,7 @@
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.0.1",
     "@actions/github": "^2.2.0",
-    "@actions/io": "file:actions-io-1.1.4.tgz",
+    "@actions/io": "file:actions-io-1.1.3.tgz",
     "@actions/tool-cache": "^1.1.2",
     "uuid": "^3.3.3"
   },