From f537562e33870bacc822d7489bbc0ff977f91ad0 Mon Sep 17 00:00:00 2001
From: Kengo TODA <skypencil@gmail.com>
Date: Wed, 14 Jul 2021 19:37:09 +0800
Subject: [PATCH] add a prefix to the cache key

https://github.com/actions/setup-java/pull/193/files#r669521434
---
 dist/cleanup/index.js | 6 ++++--
 dist/setup/index.js   | 6 ++++--
 src/cache.ts          | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index f0dbeb3b..638db47b 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -64534,6 +64534,7 @@ const core = __importStar(__webpack_require__(470));
 const glob = __importStar(__webpack_require__(281));
 const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key';
 const CACHE_MATCHED_KEY = 'cache-matched-key';
+const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
     {
         id: 'maven',
@@ -64563,7 +64564,8 @@ function findPackageManager(id) {
  */
 function computeCacheKey(packageManager) {
     return __awaiter(this, void 0, void 0, function* () {
-        return `${process.env['RUNNER_OS']}-${packageManager.id}-${yield glob.hashFiles(packageManager.pattern.join('\n'))}`;
+        const hash = yield glob.hashFiles(packageManager.pattern.join('\n'));
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
     });
 }
 /**
@@ -64581,7 +64583,7 @@ function restore(id) {
             return;
         }
         const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey, [
-            `${process.env['RUNNER_OS']}-${id}`
+            `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
         ]);
         if (matchedKey) {
             core.saveState(CACHE_MATCHED_KEY, matchedKey);
diff --git a/dist/setup/index.js b/dist/setup/index.js
index a699b541..61cf5c97 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -18930,6 +18930,7 @@ const core = __importStar(__webpack_require__(470));
 const glob = __importStar(__webpack_require__(281));
 const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key';
 const CACHE_MATCHED_KEY = 'cache-matched-key';
+const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
     {
         id: 'maven',
@@ -18959,7 +18960,8 @@ function findPackageManager(id) {
  */
 function computeCacheKey(packageManager) {
     return __awaiter(this, void 0, void 0, function* () {
-        return `${process.env['RUNNER_OS']}-${packageManager.id}-${yield glob.hashFiles(packageManager.pattern.join('\n'))}`;
+        const hash = yield glob.hashFiles(packageManager.pattern.join('\n'));
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
     });
 }
 /**
@@ -18977,7 +18979,7 @@ function restore(id) {
             return;
         }
         const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey, [
-            `${process.env['RUNNER_OS']}-${id}`
+            `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
         ]);
         if (matchedKey) {
             core.saveState(CACHE_MATCHED_KEY, matchedKey);
diff --git a/src/cache.ts b/src/cache.ts
index c7cc4ccd..86b7b72e 100644
--- a/src/cache.ts
+++ b/src/cache.ts
@@ -10,6 +10,7 @@ import * as glob from '@actions/glob';
 
 const STATE_CACHE_PRIMARY_KEY = 'cache-primary-key';
 const CACHE_MATCHED_KEY = 'cache-matched-key';
+const CACHE_KEY_PREFIX = 'setup-java';
 
 interface PackageManager {
   id: 'maven' | 'gradle';
@@ -49,9 +50,8 @@ function findPackageManager(id: string): PackageManager {
  * @see {@link https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key|spec of cache key}
  */
 async function computeCacheKey(packageManager: PackageManager) {
-  return `${process.env['RUNNER_OS']}-${packageManager.id}-${await glob.hashFiles(
-    packageManager.pattern.join('\n')
-  )}`;
+  const hash = await glob.hashFiles(packageManager.pattern.join('\n'));
+  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
 }
 
 /**
@@ -74,7 +74,7 @@ export async function restore(id: string) {
   }
 
   const matchedKey = await cache.restoreCache(packageManager.path, primaryKey, [
-    `${process.env['RUNNER_OS']}-${id}`
+    `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
   ]);
   if (matchedKey) {
     core.saveState(CACHE_MATCHED_KEY, matchedKey);