Revert "Add extra outputs for cache hits"

voroninman · voroninman · commit 93e962ee49ff · 2025-04-24T15:00:25.000+02:00
This reverts commit 19f1562.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -4935,8 +4935,6 @@ var Inputs;
 var Outputs;
 (function (Outputs) {
     Outputs["CacheHit"] = "cache-hit";
-    Outputs["ExactCacheHit"] = "exact-cache-hit";
-    Outputs["FuzzyCacheHit"] = "fuzzy-cache-hit";
 })(Outputs = exports.Outputs || (exports.Outputs = {}));
 var State;
 (function (State) {
@@ -38384,7 +38382,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCacheFeatureAvailable = exports.getInputAsInt = exports.getInputAsArray = exports.isValidEvent = exports.logWarning = exports.getCacheState = exports.setOutputAndState = exports.setFuzzyCacheHitOutput = exports.setExactCacheHitOutput = exports.setCacheHitOutput = exports.setCacheState = exports.isExactKeyMatch = exports.isGhes = void 0;
+exports.isCacheFeatureAvailable = exports.getInputAsInt = exports.getInputAsArray = exports.isValidEvent = exports.logWarning = exports.getCacheState = exports.setOutputAndState = exports.setCacheHitOutput = exports.setCacheState = exports.isExactKeyMatch = exports.isGhes = void 0;
 const cache = __importStar(__webpack_require__(692));
 const core = __importStar(__webpack_require__(470));
 const constants_1 = __webpack_require__(196);
@@ -38408,14 +38406,6 @@ function setCacheHitOutput(isCacheHit) {
     core.setOutput(constants_1.Outputs.CacheHit, isCacheHit.toString());
 }
 exports.setCacheHitOutput = setCacheHitOutput;
-function setExactCacheHitOutput(isCacheHit) {
-    core.setOutput(constants_1.Outputs.ExactCacheHit, isCacheHit.toString());
-}
-exports.setExactCacheHitOutput = setExactCacheHitOutput;
-function setFuzzyCacheHitOutput(isCacheHit) {
-    core.setOutput(constants_1.Outputs.FuzzyCacheHit, isCacheHit.toString());
-}
-exports.setFuzzyCacheHitOutput = setFuzzyCacheHitOutput;
 function setOutputAndState(key, cacheKey) {
     setCacheHitOutput(isExactKeyMatch(key, cacheKey));
     // Store the matched cache key if it exists
@@ -48966,8 +48956,6 @@ function run() {
         try {
             if (!utils.isCacheFeatureAvailable()) {
                 utils.setCacheHitOutput(false);
-                utils.setExactCacheHitOutput(false);
-                utils.setFuzzyCacheHitOutput(false);
                 return;
             }
             // Validate inputs, this can cause task failure
@@ -48992,9 +48980,7 @@ function run() {
             // Store the matched cache key
             utils.setCacheState(cacheKey);
             const isExactKeyMatch = utils.isExactKeyMatch(primaryKey, cacheKey);
-            utils.setCacheHitOutput(true);
-            utils.setExactCacheHitOutput(isExactKeyMatch);
-            utils.setFuzzyCacheHitOutput(!isExactKeyMatch);
+            utils.setCacheHitOutput(isExactKeyMatch);
             core.info(`Cache restored from key: ${cacheKey}`);
         }
         catch (error) {
diff --git a/dist/save/index.js b/dist/save/index.js
@@ -4935,8 +4935,6 @@ var Inputs;
 var Outputs;
 (function (Outputs) {
     Outputs["CacheHit"] = "cache-hit";
-    Outputs["ExactCacheHit"] = "exact-cache-hit";
-    Outputs["FuzzyCacheHit"] = "fuzzy-cache-hit";
 })(Outputs = exports.Outputs || (exports.Outputs = {}));
 var State;
 (function (State) {
@@ -38384,7 +38382,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCacheFeatureAvailable = exports.getInputAsInt = exports.getInputAsArray = exports.isValidEvent = exports.logWarning = exports.getCacheState = exports.setOutputAndState = exports.setFuzzyCacheHitOutput = exports.setExactCacheHitOutput = exports.setCacheHitOutput = exports.setCacheState = exports.isExactKeyMatch = exports.isGhes = void 0;
+exports.isCacheFeatureAvailable = exports.getInputAsInt = exports.getInputAsArray = exports.isValidEvent = exports.logWarning = exports.getCacheState = exports.setOutputAndState = exports.setCacheHitOutput = exports.setCacheState = exports.isExactKeyMatch = exports.isGhes = void 0;
 const cache = __importStar(__webpack_require__(692));
 const core = __importStar(__webpack_require__(470));
 const constants_1 = __webpack_require__(196);
@@ -38408,14 +38406,6 @@ function setCacheHitOutput(isCacheHit) {
     core.setOutput(constants_1.Outputs.CacheHit, isCacheHit.toString());
 }
 exports.setCacheHitOutput = setCacheHitOutput;
-function setExactCacheHitOutput(isCacheHit) {
-    core.setOutput(constants_1.Outputs.ExactCacheHit, isCacheHit.toString());
-}
-exports.setExactCacheHitOutput = setExactCacheHitOutput;
-function setFuzzyCacheHitOutput(isCacheHit) {
-    core.setOutput(constants_1.Outputs.FuzzyCacheHit, isCacheHit.toString());
-}
-exports.setFuzzyCacheHitOutput = setFuzzyCacheHitOutput;
 function setOutputAndState(key, cacheKey) {
     setCacheHitOutput(isExactKeyMatch(key, cacheKey));
     // Store the matched cache key if it exists
diff --git a/src/constants.ts b/src/constants.ts
@@ -6,9 +6,7 @@ export enum Inputs {
 }
 
 export enum Outputs {
-    CacheHit = "cache-hit",
-    ExactCacheHit = "exact-cache-hit",
-    FuzzyCacheHit = "fuzzy-cache-hit"
+    CacheHit = "cache-hit"
 }
 
 export enum State {
diff --git a/src/restore.ts b/src/restore.ts
@@ -8,8 +8,6 @@ async function run(): Promise<void> {
     try {
         if (!utils.isCacheFeatureAvailable()) {
             utils.setCacheHitOutput(false);
-            utils.setExactCacheHitOutput(false);
-            utils.setFuzzyCacheHitOutput(false);
             return;
         }
 
@@ -52,9 +50,7 @@ async function run(): Promise<void> {
         utils.setCacheState(cacheKey);
 
         const isExactKeyMatch = utils.isExactKeyMatch(primaryKey, cacheKey);
-        utils.setCacheHitOutput(true);
-        utils.setExactCacheHitOutput(isExactKeyMatch);
-        utils.setFuzzyCacheHitOutput(!isExactKeyMatch);
+        utils.setCacheHitOutput(isExactKeyMatch);
         core.info(`Cache restored from key: ${cacheKey}`);
     } catch (error: unknown) {
         core.setFailed((error as Error).message);
diff --git a/src/utils/actionUtils.ts b/src/utils/actionUtils.ts
@@ -27,14 +27,6 @@ export function setCacheHitOutput(isCacheHit: boolean): void {
     core.setOutput(Outputs.CacheHit, isCacheHit.toString());
 }
 
-export function setExactCacheHitOutput(isCacheHit: boolean): void {
-    core.setOutput(Outputs.ExactCacheHit, isCacheHit.toString());
-}
-
-export function setFuzzyCacheHitOutput(isCacheHit: boolean): void {
-    core.setOutput(Outputs.FuzzyCacheHit, isCacheHit.toString());
-}
-
 export function setOutputAndState(key: string, cacheKey?: string): void {
     setCacheHitOutput(isExactKeyMatch(key, cacheKey));
     // Store the matched cache key if it exists

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,7 @@ export enum Inputs {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`export enum Outputs {`
`9`		`- CacheHit = "cache-hit",`
`10`		`- ExactCacheHit = "exact-cache-hit",`
`11`		`- FuzzyCacheHit = "fuzzy-cache-hit"`
	`9`	`+ CacheHit = "cache-hit"`
`12`	`10`	`}`
`13`	`11`
`14`	`12`	`export enum State {`