Merge e2805aa8fd into e303250a24

README.md

@@ -80,7 +80,7 @@ jobs:
     steps:
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 10
 ```
 
 ###  Install only pnpm with `packageManager`
@@ -116,7 +116,7 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 10
           run_install: |
             - recursive: true
               args: [--frozen-lockfile, --strict-peer-dependencies]
@@ -141,7 +141,7 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-          version: 9
+          version: 10
           run_install: false
 
       - name: Install Node.js

src/install-pnpm/run.ts

@@ -57,16 +57,15 @@ async function readTarget(opts: {
   }
 
   if (version) {
-    if (
-      typeof packageManager === 'string' &&
-      packageManager.replace('pnpm@', '') !== version
-    ) {
-      throw new Error(`Multiple versions of pnpm specified:
-  - version ${version} in the GitHub Action config with the key "version"
-  - version ${packageManager} in the package.json with the key "packageManager"
-Remove one of these versions to avoid version mismatch errors like ERR_PNPM_BAD_PM_VERSION`)
+    if (typeof packageManager === 'string') {
+      const packageManagerVersion = packageManager.replace('pnpm@', '')
+      if(packageManagerVersion !== version && packageManagerVersion !== '*')
+        throw new Error(`Multiple versions of pnpm specified:
+    - version ${version} in the GitHub Action config with the key "version"
+    - version ${packageManager} in the package.json with the key "packageManager"
+  Remove one of these versions to avoid version mismatch errors like ERR_PNPM_BAD_PM_VERSION`)
+      return `${ standalone ? '@pnpm/exe' : 'pnpm' }@${packageManagerVersion}`
     }
-    
     return `${ standalone ? '@pnpm/exe' : 'pnpm' }@${version}`
   }