Merge d5bd7e8c9a into 2e223e0f0d

src/install-pnpm/run.ts

@@ -5,6 +5,7 @@ import { readFileSync } from 'fs'
 import path from 'path'
 import { execPath } from 'process'
 import util from 'util'
+import * as yaml from 'yaml'
 import { Inputs } from '../inputs'
 import { parse as parseYaml } from 'yaml'
 
@@ -44,7 +45,6 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
   if (exitCode === 0) {
     const pnpmHome = path.join(dest, 'node_modules/.bin')
     addPath(pnpmHome)
-    addPath(path.join(pnpmHome, 'bin'))
     exportVariable('PNPM_HOME', pnpmHome)
   }
   return exitCode
@@ -96,10 +96,18 @@ Otherwise, please specify the pnpm version in the action configuration.`)
   }
 
   if (typeof packageManager !== 'string') {
-    throw new Error(`No pnpm version is specified.
+    if (GITHUB_WORKSPACE) {
+      try {
+        const { lockfileVersion } = yaml.parse(readFileSync(path.join(GITHUB_WORKSPACE, 'pnpm-lock.yaml'), 'utf8'))
+        const version = getPnpmVersionFromLockfile(lockfileVersion);
+        return `${ standalone ? '@pnpm/exe' : 'pnpm' }@${version}`
+      } catch (error: unknown) {
+        throw new Error(`No pnpm version is specified.
 Please specify it by one of the following ways:
   - in the GitHub Action config with the key "version"
   - in the package.json with the key "packageManager"`)
+      }
+    }
   }
 
   if (!packageManager.startsWith('pnpm@')) {
@@ -113,4 +121,21 @@ Please specify it by one of the following ways:
   return packageManager
 }
 
+function getPnpmVersionFromLockfile(
+  lockfileVersion: string | undefined
+): string | undefined {
+  switch (true) {
+    case lockfileVersion === '5.3':
+      return 'latest-6';
+    case lockfileVersion === '5.4':
+      return 'latest-7';
+    case lockfileVersion === '6.0' || lockfileVersion === '6.1':
+      return 'latest-8';
+    case lockfileVersion === '7.0' || lockfileVersion === '9.0':
+      return 'latest-9';
+    default:
+      return undefined;
+  }
+}
+
 export default runSelfInstaller

src/utils/index.ts

@@ -6,5 +6,5 @@ export const getBinDest = (inputs: Inputs): string => path.join(inputs.dest, 'no
 
 export const patchPnpmEnv = (inputs: Inputs): NodeJS.ProcessEnv => ({
   ...process.env,
-  PATH: path.join(getBinDest(inputs), 'bin') + path.delimiter + getBinDest(inputs) + path.delimiter + process.env.PATH,
+  PATH: getBinDest(inputs) + path.delimiter + process.env.PATH,
 })