Merge 408bb570d1 into 0a44ba7841

__tests__/cache-restore.test.ts

@@ -9,7 +9,10 @@ import {restoreCache} from '../src/cache-restore';
 
 describe('cache-restore', () => {
   process.env['GITHUB_WORKSPACE'] = path.join(__dirname, 'data');
-  const platform = 'Linux';
+  if (!process.env.RUNNER_OS) {
+    process.env.RUNNER_OS = 'Linux';
+  }
+  const platform = process.env.RUNNER_OS;
   const arch = 'arm64';
   const commonPath = '/some/random/path';
   const npmCachePath = `${commonPath}/npm`;
@@ -52,7 +55,6 @@ describe('cache-restore', () => {
   let restoreCacheSpy: jest.SpyInstance;
   let hashFilesSpy: jest.SpyInstance;
   let archSpy: jest.SpyInstance;
-  let platformSpy: jest.SpyInstance;
 
   beforeEach(() => {
     // core
@@ -107,9 +109,6 @@ describe('cache-restore', () => {
     // os
     archSpy = jest.spyOn(osm, 'arch');
     archSpy.mockImplementation(() => arch);
-
-    platformSpy = jest.spyOn(osm, 'platform');
-    platformSpy.mockImplementation(() => platform);
   });
 
   describe('Validate provided package manager', () => {

dist/setup/index.js

@@ -93311,7 +93311,7 @@ const restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0,
     if (!packageManagerInfo) {
         throw new Error(`Caching for '${packageManager}' is not supported`);
     }
-    const platform = os_1.default.platform();
+    const platform = process.env.RUNNER_OS;
     const arch = os_1.default.arch();
     const cachePaths = yield (0, cache_utils_1.getCacheDirectories)(packageManagerInfo, cacheDependencyPath);
     core.saveState(constants_1.State.CachePaths, cachePaths);

src/cache-restore.ts

@@ -21,7 +21,7 @@ export const restoreCache = async (
   if (!packageManagerInfo) {
     throw new Error(`Caching for '${packageManager}' is not supported`);
   }
-  const platform = os.platform();
+  const platform = process.env.RUNNER_OS;
   const arch = os.arch();
 
   const cachePaths = await getCacheDirectories(