fix: remove the OS name from cache key

dist/cleanup/index.js

@@ -64536,7 +64536,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.save = exports.restore = void 0;
+exports.save = exports.restore = exports.computeCacheKey = exports.findPackageManager = void 0;
 const path_1 = __webpack_require__(622);
 const os_1 = __importDefault(__webpack_require__(87));
 const cache = __importStar(__webpack_require__(692));
@@ -64566,18 +64566,20 @@ function findPackageManager(id) {
     }
     return packageManager;
 }
+exports.findPackageManager = findPackageManager;
 /**
  * A function that generates a cache key to use.
- * Format of the generated key will be "${{ platform }}-${{ id }}-${{ fileHash }}"".
+ * Format of the generated key will be "setup-java-${{ id }}-${{ fileHash }}"".
  * If there is no file matched to {@link PackageManager.path}, the generated key ends with a dash (-).
  * @see {@link https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key|spec of cache key}
  */
 function computeCacheKey(packageManager) {
     return __awaiter(this, void 0, void 0, function* () {
         const hash = yield glob.hashFiles(packageManager.pattern.join('\n'));
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
+        return `${CACHE_KEY_PREFIX}-${packageManager.id}-${hash}`;
     });
 }
+exports.computeCacheKey = computeCacheKey;
 /**
  * Restore the dependency cache
  * @param id ID of the package manager, should be "maven" or "gradle"
@@ -64592,7 +64594,7 @@ function restore(id) {
             throw new Error(`No file in ${process.cwd()} matched to [${packageManager.pattern}], make sure you have checked out the target repository`);
         }
         const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey, [
-            `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
+            `${CACHE_KEY_PREFIX}-${id}`
         ]);
         if (matchedKey) {
             core.saveState(CACHE_MATCHED_KEY, matchedKey);

dist/setup/index.js

@@ -18923,7 +18923,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.save = exports.restore = void 0;
+exports.save = exports.restore = exports.computeCacheKey = exports.findPackageManager = void 0;
 const path_1 = __webpack_require__(622);
 const os_1 = __importDefault(__webpack_require__(87));
 const cache = __importStar(__webpack_require__(692));
@@ -18953,18 +18953,20 @@ function findPackageManager(id) {
     }
     return packageManager;
 }
+exports.findPackageManager = findPackageManager;
 /**
  * A function that generates a cache key to use.
- * Format of the generated key will be "${{ platform }}-${{ id }}-${{ fileHash }}"".
+ * Format of the generated key will be "setup-java-${{ id }}-${{ fileHash }}"".
  * If there is no file matched to {@link PackageManager.path}, the generated key ends with a dash (-).
  * @see {@link https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key|spec of cache key}
  */
 function computeCacheKey(packageManager) {
     return __awaiter(this, void 0, void 0, function* () {
         const hash = yield glob.hashFiles(packageManager.pattern.join('\n'));
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
+        return `${CACHE_KEY_PREFIX}-${packageManager.id}-${hash}`;
     });
 }
+exports.computeCacheKey = computeCacheKey;
 /**
  * Restore the dependency cache
  * @param id ID of the package manager, should be "maven" or "gradle"
@@ -18979,7 +18981,7 @@ function restore(id) {
             throw new Error(`No file in ${process.cwd()} matched to [${packageManager.pattern}], make sure you have checked out the target repository`);
         }
         const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey, [
-            `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
+            `${CACHE_KEY_PREFIX}-${id}`
         ]);
         if (matchedKey) {
             core.saveState(CACHE_MATCHED_KEY, matchedKey);

src/cache.ts

@@ -35,7 +35,7 @@ const supportedPackageManager: PackageManager[] = [
   }
 ];
 
-function findPackageManager(id: string): PackageManager {
+export function findPackageManager(id: string): PackageManager {
   const packageManager = supportedPackageManager.find(packageManager => packageManager.id === id);
   if (packageManager === undefined) {
     throw new Error(`unknown package manager specified: ${id}`);
@@ -45,13 +45,13 @@ function findPackageManager(id: string): PackageManager {
 
 /**
  * A function that generates a cache key to use.
- * Format of the generated key will be "${{ platform }}-${{ id }}-${{ fileHash }}"".
+ * Format of the generated key will be "setup-java-${{ id }}-${{ fileHash }}"".
  * If there is no file matched to {@link PackageManager.path}, the generated key ends with a dash (-).
  * @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) {
+export async function computeCacheKey(packageManager: PackageManager) {
   const hash = await glob.hashFiles(packageManager.pattern.join('\n'));
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${hash}`;
+  return `${CACHE_KEY_PREFIX}-${packageManager.id}-${hash}`;
 }
 
 /**
@@ -73,7 +73,7 @@ export async function restore(id: string) {
   }
 
   const matchedKey = await cache.restoreCache(packageManager.path, primaryKey, [
-    `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
+    `${CACHE_KEY_PREFIX}-${id}`
   ]);
   if (matchedKey) {
     core.saveState(CACHE_MATCHED_KEY, matchedKey);