Merge pull request #751 from edoardopirovano/deprecare-rmdir

Remove calls to `fs.rmdirSync`

lib/runner.js

@@ -124,7 +124,7 @@ program
         const checkoutPath = cmd.checkoutPath || process.cwd();
         // Wipe the temp dir
         logger.info(`Cleaning temp directory ${tempDir}`);
-        fs.rmdirSync(tempDir, { recursive: true });
+        fs.rmSync(tempDir, { recursive: true, force: true });
         fs.mkdirSync(tempDir, { recursive: true });
         const auth = await (0, util_1.getGitHubAuth)(logger, cmd.githubAuth, cmd.githubAuthStdin);
         const apiDetails = {

lib/toolcache.js

@@ -236,8 +236,8 @@ function createToolPath(tool, version, arch, toolCacheDir, logger) {
     const folderPath = path.join(toolCacheDir, tool, semver.clean(version) || version, arch || "");
     logger.debug(`destination ${folderPath}`);
     const markerPath = `${folderPath}.complete`;
-    fs.rmdirSync(folderPath, { recursive: true });
-    fs.rmdirSync(markerPath, { recursive: true });
+    fs.rmSync(folderPath, { recursive: true, force: true });
+    fs.rmSync(markerPath, { recursive: true, force: true });
     fs.mkdirSync(folderPath, { recursive: true });
     return folderPath;
 }

lib/util.js

@@ -77,7 +77,7 @@ async function withTmpDir(body) {
     const symlinkSubdir = path.join(tmpDir, "symlink");
     fs.symlinkSync(realSubdir, symlinkSubdir, "dir");
     const result = await body(symlinkSubdir);
-    fs.rmdirSync(tmpDir, { recursive: true });
+    fs.rmSync(tmpDir, { recursive: true, force: true });
     return result;
 }
 exports.withTmpDir = withTmpDir;

src/runner.ts

@@ -177,7 +177,7 @@ program
 
       // Wipe the temp dir
       logger.info(`Cleaning temp directory ${tempDir}`);
-      fs.rmdirSync(tempDir, { recursive: true });
+      fs.rmSync(tempDir, { recursive: true, force: true });
       fs.mkdirSync(tempDir, { recursive: true });
 
       const auth = await getGitHubAuth(

src/toolcache.ts

@@ -268,8 +268,8 @@ function createToolPath(
   );
   logger.debug(`destination ${folderPath}`);
   const markerPath = `${folderPath}.complete`;
-  fs.rmdirSync(folderPath, { recursive: true });
-  fs.rmdirSync(markerPath, { recursive: true });
+  fs.rmSync(folderPath, { recursive: true, force: true });
+  fs.rmSync(markerPath, { recursive: true, force: true });
   fs.mkdirSync(folderPath, { recursive: true });
   return folderPath;
 }

src/util.ts

@@ -68,7 +68,7 @@ export async function withTmpDir<T>(
   const symlinkSubdir = path.join(tmpDir, "symlink");
   fs.symlinkSync(realSubdir, symlinkSubdir, "dir");
   const result = await body(symlinkSubdir);
-  fs.rmdirSync(tmpDir, { recursive: true });
+  fs.rmSync(tmpDir, { recursive: true, force: true });
   return result;
 }