Rework cache handling

package.json

@@ -23,11 +23,11 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^2.0.2",
+    "@actions/cache": "^3.0.0",
     "@actions/core": "^1.6.0",
     "@actions/exec": "^1.1.0",
     "@actions/glob": "^0.2.0",
-    "@actions/http-client": "^1.0.6",
+    "@actions/http-client": "^2.0.1",
     "@actions/io": "^1.0.2",
     "@actions/tool-cache": "^1.5.5",
     "semver": "^6.1.1"

src/cache-restore.ts

@@ -34,26 +34,17 @@ export const restoreCache = async (
 
   core.saveState(State.CachePrimaryKey, primaryKey);
 
-  try {
-    const cacheKey = await cache.restoreCache(cachePaths, primaryKey);
-    core.setOutput(Outputs.CacheHit, Boolean(cacheKey));
+  const cacheKey = await cache.restoreCache(cachePaths, primaryKey);
+  core.setOutput(Outputs.CacheHit, Boolean(cacheKey));
 
-    if (!cacheKey) {
-      core.info(`Cache is not found`);
-      return;
-    }
-
-    core.saveState(State.CacheMatchedKey, cacheKey);
-    core.info(`Cache restored from key: ${cacheKey}`);
-  } catch (error) {
-    const typedError = error as Error;
-    if (typedError.name === cache.ValidationError.name) {
-      throw error;
-    } else {
-      core.warning(typedError.message);
-      core.setOutput(Outputs.CacheHit, false);
-    }
+  if (!cacheKey) {
+    core.info(`Cache is not found`);
+    core.setOutput(Outputs.CacheHit, false);
+    return;
   }
+
+  core.saveState(State.CacheMatchedKey, cacheKey);
+  core.info(`Cache restored from key: ${cacheKey}`);
 };
 
 const findDependencyFile = (packageManager: PackageManagerInfo) => {

src/cache-save.ts

@@ -58,18 +58,11 @@ const cachePackages = async () => {
     return;
   }
 
-  try {
-    await cache.saveCache(cachePaths, primaryKey);
-    core.info(`Cache saved with the key: ${primaryKey}`);
-  } catch (error) {
-    if (error.name === cache.ValidationError.name) {
-      throw error;
-    } else if (error.name === cache.ReserveCacheError.name) {
-      core.info(error.message);
-    } else {
-      core.warning(`${error.message}`);
-    }
+  const cacheId = await cache.saveCache(cachePaths, primaryKey);
+  if (cacheId == -1) {
+    return;
   }
+  core.info(`Cache saved with the key: ${primaryKey}`);
 };
 
 export function logWarning(message: string): void {