Merge fb1387391a into efcb663fc6

__tests__/cache-restore.test.ts

@@ -8,13 +8,9 @@ import * as utils from '../src/cache-utils';
 import {restoreCache} from '../src/cache-restore';
 
 describe('cache-restore', () => {
-  const packageManagers = ['yarn', 'npm', 'pnpm'] as const;
+  const setWorkspaceFor = (pm: 'npm' | 'yarn' | 'pnpm') => {
-  type PackageManager = (typeof packageManagers)[number];
-
-  const setWorkspaceFor = (pm: PackageManager) => {
     process.env['GITHUB_WORKSPACE'] = path.join(__dirname, 'data', pm);
   };
-  const originalGithubWorkspace = process.env['GITHUB_WORKSPACE'];
   if (!process.env.RUNNER_OS) {
     process.env.RUNNER_OS = 'Linux';
   }
@@ -134,11 +130,11 @@ describe('cache-restore', () => {
       ['yarn', '1.2.3', yarnFileHash],
       ['npm', '', npmFileHash],
       ['pnpm', '', pnpmFileHash]
-    ] as const)(
+    ])(
       'restored dependencies for %s',
       async (packageManager, toolVersion, fileHash) => {
         // Set workspace to the appropriate fixture folder
-        setWorkspaceFor(packageManager);
+        setWorkspaceFor(packageManager as 'npm' | 'yarn' | 'pnpm');
         getCommandOutputSpy.mockImplementation((command: string) => {
           if (command.includes('version')) {
             return toolVersion;
@@ -166,11 +162,11 @@ describe('cache-restore', () => {
       ['yarn', '1.2.3', yarnFileHash],
       ['npm', '', npmFileHash],
       ['pnpm', '', pnpmFileHash]
-    ] as const)(
+    ])(
       'dependencies are changed %s',
       async (packageManager, toolVersion, fileHash) => {
         // Set workspace to the appropriate fixture folder
-        setWorkspaceFor(packageManager);
+        setWorkspaceFor(packageManager as 'npm' | 'yarn' | 'pnpm');
         getCommandOutputSpy.mockImplementation((command: string) => {
           if (command.includes('version')) {
             return toolVersion;
@@ -191,11 +187,6 @@ describe('cache-restore', () => {
   });
 
   afterEach(() => {
-    if (originalGithubWorkspace === undefined) {
-      delete process.env['GITHUB_WORKSPACE'];
-    } else {
-      process.env['GITHUB_WORKSPACE'] = originalGithubWorkspace;
-    }
     jest.resetAllMocks();
     jest.clearAllMocks();
   });