Update dependencies, clean both debug and release targets

package.json

@@ -22,15 +22,15 @@
   },
   "homepage": "https://github.com/Swatinem/rust-cache#readme",
   "dependencies": {
-    "@actions/cache": "^1.0.8",
+    "@actions/cache": "^2.0.2",
     "@actions/core": "^1.6.0",
-    "@actions/exec": "^1.1.0",
-    "@actions/glob": "^0.2.0",
-    "@actions/io": "^1.1.1"
+    "@actions/exec": "^1.1.1",
+    "@actions/glob": "^0.2.1",
+    "@actions/io": "^1.1.2"
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.33.1",
-    "typescript": "4.5.4"
+    "@vercel/ncc": "^0.33.3",
+    "typescript": "4.6.3"
   },
   "scripts": {
     "prepare": "ncc build --target es2020 -o dist/restore src/restore.ts && ncc build --target es2020 -o dist/save src/save.ts"

src/common.ts

@@ -10,7 +10,7 @@ import path from "path";
 process.on("uncaughtException", (e) => {
   core.info(`[warning] ${e.message}`);
   if (e.stack) {
-    core.info(e.stack)
+    core.info(e.stack);
   }
 });
 
@@ -192,21 +192,33 @@ export async function getPackages(): Promise<Packages> {
 
 export async function cleanTarget(packages: Packages) {
   await fs.promises.unlink(path.join(targetDir, "./.rustc_info.json"));
-  await io.rmRF(path.join(targetDir, "./debug/examples"));
-  await io.rmRF(path.join(targetDir, "./debug/incremental"));
+
+  await cleanProfileTarget(packages, "debug");
+  await cleanProfileTarget(packages, "release");
+}
+
+async function cleanProfileTarget(packages: Packages, profile: string) {
+  try {
+    await fs.promises.access(path.join(targetDir, profile));
+  } catch {
+    return;
+  }
+
+  await io.rmRF(path.join(targetDir, profile, "./examples"));
+  await io.rmRF(path.join(targetDir, profile, "./incremental"));
 
   let dir: fs.Dir;
-  // remove all *files* from debug
-  dir = await fs.promises.opendir(path.join(targetDir, "./debug"));
+  // remove all *files* from the profile directory
+  dir = await fs.promises.opendir(path.join(targetDir, profile));
   for await (const dirent of dir) {
     if (dirent.isFile()) {
       await rm(dir.path, dirent);
     }
   }
 
   const keepPkg = new Set(packages.map((p) => p.name));
-  await rmExcept(path.join(targetDir, "./debug/build"), keepPkg);
-  await rmExcept(path.join(targetDir, "./debug/.fingerprint"), keepPkg);
+  await rmExcept(path.join(targetDir, profile, "./build"), keepPkg);
+  await rmExcept(path.join(targetDir, profile, "./.fingerprint"), keepPkg);
 
   const keepDeps = new Set(
     packages.flatMap((p) => {
@@ -218,7 +230,7 @@ export async function cleanTarget(packages: Packages) {
       return names;
     }),
   );
-  await rmExcept(path.join(targetDir, "./debug/deps"), keepDeps);
+  await rmExcept(path.join(targetDir, profile, "./deps"), keepDeps);
 }
 
 const oneWeek = 7 * 24 * 3600 * 1000;

src/restore.ts

@@ -3,6 +3,11 @@ import * as core from "@actions/core";
 import { cleanTarget, getCacheConfig, getCargoBins, getPackages, stateBins, stateKey } from "./common";
 
 async function run() {
+  if (!cache.isFeatureAvailable()) {
+    setCacheHitOutput(false);
+    return;
+  }
+
   try {
     var cacheOnFailure = core.getInput("cache-on-failure").toLowerCase();
     if (cacheOnFailure !== "true") {

src/save.ts

@@ -18,6 +18,10 @@ import {
 } from "./common";
 
 async function run() {
+  if (!cache.isFeatureAvailable()) {
+    return;
+  }
+
   try {
     const { paths: savePaths, key } = await getCacheConfig();