dhvcc
diff --git a/‎dist/cache-save/index.js
Lines changed: 3 additions & 4 deletions b/‎dist/cache-save/index.js
Lines changed: 3 additions & 4 deletions
diff --git a/‎dist/setup/index.js
Lines changed: 3 additions & 4 deletions b/‎dist/setup/index.js
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/cache-distributions/cache-distributor.ts
Lines changed: 3 additions & 7 deletions b/‎src/cache-distributions/cache-distributor.ts
Lines changed: 3 additions & 7 deletions
diff --git a/‎src/utils.ts
Lines changed: 0 additions & 9 deletions b/‎src/utils.ts
Lines changed: 0 additions & 9 deletions
@@ -37234,18 +37234,17 @@ class CacheDistributor {
             core.saveState(State.CACHE_PATHS, cachePath);
             core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);
             const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
-            this.handleMatchResult(matchedKey);
+            this.handleMatchResult(matchedKey, primaryKey);
         });
     }
-    handleMatchResult(matchedKey) {
-        if (matchedKey) {
+    handleMatchResult(matchedKey, primaryKey) {
+        if (matchedKey == primaryKey) {
             core.saveState(State.CACHE_MATCHED_KEY, matchedKey);
             core.info(`Cache restored from key: ${matchedKey}`);
         }
         else {
             core.info(`${this.packageManager} cache is not found`);
         }
-        core.info('cache was hit');
         core.setOutput('cache-hit', Boolean(matchedKey));
     }
 }
 
@@ -42579,18 +42579,17 @@ class CacheDistributor {
             core.saveState(State.CACHE_PATHS, cachePath);
             core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);
             const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
-            this.handleMatchResult(matchedKey);
+            this.handleMatchResult(matchedKey, primaryKey);
         });
     }
-    handleMatchResult(matchedKey) {
-        if (matchedKey) {
+    handleMatchResult(matchedKey, primaryKey) {
+        if (matchedKey == primaryKey) {
             core.saveState(State.CACHE_MATCHED_KEY, matchedKey);
             core.info(`Cache restored from key: ${matchedKey}`);
         }
         else {
             core.info(`${this.packageManager} cache is not found`);
         }
-        core.info('cache was hit');
         core.setOutput('cache-hit', Boolean(matchedKey));
     }
 }
 
@@ -1,6 +1,5 @@
 import * as cache from '@actions/cache';
 import * as core from '@actions/core';
-import {PromiseReturnType} from '../utils';
 
 export enum State {
   STATE_CACHE_PRIMARY_KEY = 'cache-primary-key',
@@ -42,19 +41,16 @@ abstract class CacheDistributor {
       restoreKey
     );
 
-    this.handleMatchResult(matchedKey);
+    this.handleMatchResult(matchedKey, primaryKey);
   }
 
-  public handleMatchResult(
-    matchedKey: PromiseReturnType<typeof cache.restoreCache>
-  ) {
-    if (matchedKey) {
+  public handleMatchResult(matchedKey: string | undefined, primaryKey: string) {
+    if (matchedKey == primaryKey) {
       core.saveState(State.CACHE_MATCHED_KEY, matchedKey);
       core.info(`Cache restored from key: ${matchedKey}`);
     } else {
       core.info(`${this.packageManager} cache is not found`);
     }
-    core.info('cache was hit');
     core.setOutput('cache-hit', Boolean(matchedKey));
   }
 }
 
@@ -119,12 +119,3 @@ export function isCacheFeatureAvailable(): boolean {
 
   return true;
 }
-
-// Awaited (typescript 4.5+) polyfill. Not ideal, so use with care
-export type AwaitedPolyfill<T> = T extends PromiseLike<infer U>
-  ? AwaitedPolyfill<U>
-  : T;
-// Extract return type from promise
-export type PromiseReturnType<
-  T extends (...args: any) => any
-> = AwaitedPolyfill<ReturnType<T>>;
Original file line number	Diff line number	Diff line change
`@@ -37234,18 +37234,17 @@ class CacheDistributor {`
`37234`	`37234`	`core.saveState(State.CACHE_PATHS, cachePath);`
`37235`	`37235`	`core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);`
`37236`	`37236`	`const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);`
`37237`		`- this.handleMatchResult(matchedKey);`
	`37237`	`+ this.handleMatchResult(matchedKey, primaryKey);`
`37238`	`37238`	`});`
`37239`	`37239`	`}`
`37240`		`- handleMatchResult(matchedKey) {`
`37241`		`- if (matchedKey) {`
	`37240`	`+ handleMatchResult(matchedKey, primaryKey) {`
	`37241`	`+ if (matchedKey == primaryKey) {`
`37242`	`37242`	`core.saveState(State.CACHE_MATCHED_KEY, matchedKey);`
`37243`	`37243`	core.info(`Cache restored from key: ${matchedKey}`);
`37244`	`37244`	`}`
`37245`	`37245`	`else {`
`37246`	`37246`	core.info(`${this.packageManager} cache is not found`);
`37247`	`37247`	`}`
`37248`		`- core.info('cache was hit');`
`37249`	`37248`	`core.setOutput('cache-hit', Boolean(matchedKey));`
`37250`	`37249`	`}`
`37251`	`37250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42579,18 +42579,17 @@ class CacheDistributor {`
`42579`	`42579`	`core.saveState(State.CACHE_PATHS, cachePath);`
`42580`	`42580`	`core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);`
`42581`	`42581`	`const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);`
`42582`		`- this.handleMatchResult(matchedKey);`
	`42582`	`+ this.handleMatchResult(matchedKey, primaryKey);`
`42583`	`42583`	`});`
`42584`	`42584`	`}`
`42585`		`- handleMatchResult(matchedKey) {`
`42586`		`- if (matchedKey) {`
	`42585`	`+ handleMatchResult(matchedKey, primaryKey) {`
	`42586`	`+ if (matchedKey == primaryKey) {`
`42587`	`42587`	`core.saveState(State.CACHE_MATCHED_KEY, matchedKey);`
`42588`	`42588`	core.info(`Cache restored from key: ${matchedKey}`);
`42589`	`42589`	`}`
`42590`	`42590`	`else {`
`42591`	`42591`	core.info(`${this.packageManager} cache is not found`);
`42592`	`42592`	`}`
`42593`		`- core.info('cache was hit');`
`42594`	`42593`	`core.setOutput('cache-hit', Boolean(matchedKey));`
`42595`	`42594`	`}`
`42596`	`42595`	`}`