Merge 2504c6551f into 89d709d423

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

src/main.ts

@@ -67,19 +67,26 @@ export async function run() {
       auth.configAuthentication(registryUrl, alwaysAuth);
     }
 
-    const resolvedPackageManager = getNameFromPackageManagerField();
     const cacheDependencyPath = core.getInput('cache-dependency-path');
-    if (cache && isCacheFeatureAvailable()) {
+    if (isCacheFeatureAvailable()) {
-      core.saveState(State.CachePackageManager, cache);
+      // we only determine the package manager type if we can cache in the first place
-      await restoreCache(cache, cacheDependencyPath);
+      if (cache) {
-    } else if (resolvedPackageManager && packagemanagercache) {
+        // in previous version of setup-node, user can explicitly specify what package manager they are using, we prefer that
-      core.info(
+        core.saveState(State.CachePackageManager, cache);
-        "Detected package manager from package.json's packageManager field: " +
+        await restoreCache(cache, cacheDependencyPath);
-          resolvedPackageManager +
+      } else if (packagemanagercache) {
-          '. Auto caching has been enabled for it. If you want to disable it, set package-manager-cache input to false'
+        // only if user hasn't specify the "cache" (introduced in the previous version) we read the "package-manager-cache" field
-      );
+        const resolvedPackageManager = getNameFromPackageManagerField(); // only then we look for "package.json" for package manager
-      core.saveState(State.CachePackageManager, resolvedPackageManager);
+        if (resolvedPackageManager) {
-      await restoreCache(resolvedPackageManager, cacheDependencyPath);
+          core.info(
+            "Detected package manager from package.json's packageManager field: " +
+              resolvedPackageManager +
+              '. Auto caching has been enabled for it. If you want to disable it, set package-manager-cache input to false'
+          );
+          core.saveState(State.CachePackageManager, resolvedPackageManager);
+          await restoreCache(resolvedPackageManager, cacheDependencyPath);
+        }
+      }
     }
 
     const matchersPath = path.join(__dirname, '../..', '.github');