fix: append (not prepend) action node dir to PATH for npm bootstrap

#239 prepended `dirname(process.execPath)` to PATH so npm's
`#!/usr/bin/env node` shebang resolves on GHE self-hosted runners
where node isn't on PATH. But on runners with a prior `setup-node`
step, this shadowed the user's installed toolchain with the
runner-bundled node (e.g. externals/node24/bin), pairing the user's
npm with a mismatched node — or picking up a broken `npm` shipped
next to the runner-bundled node.

Append instead so a user-installed toolchain on PATH keeps
precedence; the runner's node dir remains as a fallback for the
original #234 case where node isn't on PATH at all.

Fixes #240

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @zkochan

.github/workflows/test.yaml

@@ -1,73 +1,43 @@
 name: Test Action
 
 on:
-  pull_request:
+  - push
-  push:
+  - pull_request
-    branches:
+  - workflow_dispatch
-      - master
-  workflow_dispatch:
 
 jobs:
-  smoke:
+  test_default_inputs:
-    # Cross-OS coverage. Exercises the bootstrap install + PATH on each platform,
+    name: Test with default inputs
-    # the version-respects-request regression (#225 / #230 — Windows PATH shadow),
-    # and the bin_dest output regression (#247). Multi-version coverage on Linux
-    # so we don't pay 3x for major-version differences.
-    name: 'Smoke (${{ matrix.name }})'
 
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        include:
+        pnpm:
-          - name: 'ubuntu / v9.15.5'
+          - 9.15.5
-            os: ubuntu-latest
+        os:
-            version: '9.15.5'
+          - ubuntu-latest
-          - name: 'ubuntu / v10.33.0'
+          - macos-latest
-            os: ubuntu-latest
+          - windows-latest
-            version: '10.33.0'
-          - name: 'ubuntu / v9.15.5 / custom-dest'
-            os: ubuntu-latest
-            version: '9.15.5'
-            dest: '~/test/pnpm'
-          - name: 'macos / v9.15.5'
-            os: macos-latest
-            version: '9.15.5'
-          - name: 'windows / v9.15.5'
-            os: windows-latest
-            version: '9.15.5'
 
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
 
-      - id: pnpm
+      - name: Run the action
-        name: Run the action
         uses: ./
         with:
-          version: ${{ matrix.version }}
+          version: 9.15.5
-          dest: ${{ matrix.dest || '~/setup-pnpm' }}
 
-      - name: 'Test: pnpm/pnpx on PATH report the requested version (incl. via bin_dest)'
+      - name: 'Test: which'
-        # Pass paths via env, not template interpolation, so Windows
+        run: which pnpm; which pnpx
-        # backslashes in `bin_dest` aren't eaten by bash's escape handling.
+
-        env:
+      - name: 'Test: version'
-          BIN_DEST: ${{ steps.pnpm.outputs.bin_dest }}
-          REQUIRED: ${{ matrix.version }}
         run: |
-          set -e
-          which pnpm
-          which pnpx
           actual="$(pnpm --version)"
-          echo "pnpm --version: ${actual}"
+          echo "pnpm version: ${actual}"
-          if [ "${actual}" != "${REQUIRED}" ]; then
+          if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
-            echo "Expected pnpm version ${REQUIRED}, but got ${actual}"
+            echo "ERROR: pnpm --version did not produce valid output"
-            exit 1
-          fi
-          bin_dest_version="$("$BIN_DEST/pnpm" --version)"
-          echo "bin_dest pnpm --version: ${bin_dest_version}"
-          if [ "${bin_dest_version}" != "${REQUIRED}" ]; then
-            echo "Expected ${REQUIRED} via bin_dest, but got ${bin_dest_version}"
             exit 1
           fi
         shell: bash
@@ -80,95 +50,54 @@ jobs:
           pnpm add is-odd
         shell: bash
 
-  manifest_pin:
+  test_dest:
-    # Folds the old test_package_manager_field, test_dev_engines, and
+    name: Test with dest
-    # test_dev_engines_on_fail_error jobs. The action's manifest handling is
-    # OS-independent, so ubuntu-only is sufficient.
-    name: 'Manifest pin: ${{ matrix.label }}'
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        include:
+        pnpm:
-          - label: 'packageManager pnpm@9.15.5 (#227)'
+          - 9.15.5
-            manifest: '{"packageManager":"pnpm@9.15.5"}'
+        os:
-            version: '9.15.5'
+          - ubuntu-latest
-          - label: 'packageManager pnpm@10.33.0'
+          - macos-latest
-            manifest: '{"packageManager":"pnpm@10.33.0"}'
+          - windows-latest
-            version: '10.33.0'
-          - label: 'devEngines onFail=download, exact'
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"9.15.5","onFail":"download"}}}'
-            version: '9.15.5'
-          - label: 'devEngines onFail=download, range'
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":">=9.15.0","onFail":"download"}}}'
-            version: '>=9.15.0'
-          - label: 'devEngines onFail=error, exact (#252)'
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"9.15.5","onFail":"error"}}}'
-            version: '9.15.5'
-          - label: 'devEngines onFail=error, range (#252)'
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":">=9.15.0","onFail":"error"}}}'
-            version: '>=9.15.0'
-          - label: 'explicit version: pnpm_config_pm_on_fail not exported'
-            # Regression guard for the af8e203 scope fix: when the user passes an
-            # explicit `version:` input, the action must NOT export
-            # pnpm_config_pm_on_fail=download, so the user's strict onFail policy
-            # is preserved. Asserted directly on the env var rather than pnpm
-            # runtime behavior — different pnpm majors read devEngines
-            # differently (v10 ignores it, v11+ honors it).
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"9.15.5","onFail":"error"}}}'
-            explicit_version: '10.33.0'
-            expect_pm_on_fail_unset: true
 
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
 
-      - name: Set up package.json
-        run: echo '${{ matrix.manifest }}' > package.json
-        shell: bash
-
       - name: Run the action
         uses: ./
         with:
-          version: ${{ matrix.explicit_version }}
+          version: 9.15.5
+          dest: ~/test/pnpm
 
-      - name: 'Test: pnpm reports the pinned version'
+      - name: 'Test: which'
-        if: ${{ !matrix.expect_pm_on_fail_unset }}
+        run: which pnpm && which pnpx
-        env:
+
-          REQUIRED: ${{ matrix.version }}
+      - name: 'Test: version'
         run: |
-          set -e
           actual="$(pnpm --version)"
           echo "pnpm version: ${actual}"
-          if [ "${REQUIRED}" = ">=9.15.0" ]; then
+          if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
-            min="9.15.0"
+            echo "ERROR: pnpm --version did not produce valid output"
-            if [ "$(printf '%s\n' "${min}" "${actual}" | sort -V | head -n1)" != "${min}" ]; then
-              echo "Expected pnpm version >= ${min}, but got ${actual}"
             exit 1
           fi
-          else
-            if [ "${actual}" != "${REQUIRED}" ]; then
-              echo "Expected pnpm version ${REQUIRED}, but got ${actual}"
-              exit 1
-            fi
-          fi
         shell: bash
 
-      - name: 'Test: pnpm_config_pm_on_fail not exported (explicit version preserves strict policy)'
+  test_standalone:
-        if: ${{ matrix.expect_pm_on_fail_unset }}
+    name: Test with standalone
-        run: |
-          if [ -n "${pnpm_config_pm_on_fail:-}" ]; then
-            echo "Expected pnpm_config_pm_on_fail to be unset, but got: '${pnpm_config_pm_on_fail}'"
-            exit 1
-          fi
-          echo "pnpm_config_pm_on_fail is unset, as expected"
-        shell: bash
 
-  standalone:
+    runs-on: ${{ matrix.os }}
-    name: Standalone mode
 
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
 
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
@@ -179,77 +108,167 @@ jobs:
           version: 9.15.0
           standalone: true
 
-      - name: 'Test: pnpm works'
+      - name: 'Test: which'
+        run: which pnpm
+
+      - name: 'Test: version'
         run: |
-          set -e
-          which pnpm
           actual="$(pnpm --version)"
-          if [ "${actual}" != "9.15.0" ]; then
+          echo "pnpm version: ${actual}"
-            echo "Expected 9.15.0, got ${actual}"
+          if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
+            echo "ERROR: pnpm --version did not produce valid output"
             exit 1
           fi
+        shell: bash
+
+      - name: 'Test: install in a fresh project'
+        run: |
           mkdir /tmp/test-standalone
           cd /tmp/test-standalone
           pnpm init
           pnpm add is-odd
         shell: bash
 
-  cache_store_path:
+  test_version_respects_request:
-    # Regression guard for #233. When package.json pins a pnpm major that
+    name: 'Test version input is actually installed (${{ matrix.version }}, ${{ matrix.os }})'
-    # differs from the bootstrap pnpm's major, the bootstrap reports its
+    # Regression test for #225 / #230: the bootstrap pnpm on PATH was shadowing the self-updated binary,
-    # own STORE_VERSION from `pnpm store path` (the `store` command skips
+    # so a user requesting e.g. `version: 9.15.5` would silently get the bootstrap version.
-    # pnpm's auto-switch). The user's actual `pnpm install` runs under the
-    # pinned version and writes to a different STORE_VERSION, so the post
-    # step's saveCache then fails with "Path Validation Error". The fix is
-    # to self-update the bootstrap to the pinned version up front.
-    name: 'Cache store path matches install (#233): ${{ matrix.label }}'
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        include:
+        os:
-          - label: 'packageManager pnpm@10.33.0'
+          - ubuntu-latest
-            manifest: '{"packageManager":"pnpm@10.33.0","dependencies":{"is-odd":"3.0.1"}}'
+          - macos-latest
-          - label: 'devEngines exact pnpm@10.33.0'
+          - windows-latest
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"10.33.0"}},"dependencies":{"is-odd":"3.0.1"}}'
+        version:
-          - label: 'devEngines range >=10 <11'
+          - '9.15.5'
-            manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":">=10 <11"}},"dependencies":{"is-odd":"3.0.1"}}'
+          - '10.33.0'
 
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
 
-      - name: Set up package.json
+      - name: Run the action
-        run: echo '${{ matrix.manifest }}' > package.json
-        shell: bash
-
-      - id: pnpm
         uses: ./
         with:
-          cache: true
+          version: ${{ matrix.version }}
-          run_install: |
-            - args: [--no-frozen-lockfile]
 
-      - name: 'Test: store path computed by the action exists on disk'
+      - name: 'Test: exact version installed'
         run: |
-          set -e
+          required='${{ matrix.version }}'
-          actual="$(pnpm store path --silent)"
+          actual="$(pnpm --version)"
-          echo "pnpm store path: ${actual}"
+          echo "pnpm version: ${actual}"
-          if [ ! -d "${actual}" ]; then
+          if [ "${actual}" != "${required}" ]; then
-            echo "Expected store path to exist on disk; cache save would fail"
+            echo "Expected pnpm version ${required}, but got ${actual}"
             exit 1
           fi
         shell: bash
 
-  run_install:
+  test_package_manager_field:
-    name: 'run_install (${{ matrix.run_install.name }})'
+    name: 'Test packageManager field is respected (${{ matrix.version }}, ${{ matrix.os }})'
+    # Reproduces #227: when `packageManager` is set in package.json and no `version:` input is given,
+    # the action should install the version specified there.
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+        version:
+          - '9.15.5'
+          - '10.33.0'
+
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Set up package.json with packageManager field
+        run: echo '{"packageManager":"pnpm@${{ matrix.version }}"}' > package.json
+        shell: bash
+
+      - name: Run the action
+        uses: ./
+
+      - name: 'Test: exact version installed'
+        run: |
+          required='${{ matrix.version }}'
+          actual="$(pnpm --version)"
+          echo "pnpm version: ${actual}"
+          if [ "${actual}" != "${required}" ]; then
+            echo "Expected pnpm version ${required}, but got ${actual}"
+            exit 1
+          fi
+        shell: bash
+
+  test_dev_engines:
+    name: Test with devEngines.packageManager
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+        version:
+          - '9.15.5'
+          - '>=9.15.0'
+
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+
+      - name: Set up package.json with devEngines.packageManager
+        run: echo '{"devEngines":{"packageManager":{"name":"pnpm","version":"${{ matrix.version }}","onFail":"download"}}}' > package.json
+        shell: bash
+
+      - name: Run the action
+        uses: ./
+
+      - name: 'Test: which'
+        run: which pnpm; which pnpx
+
+      - name: 'Test: version'
+        run: |
+          set -e
+          required='${{ matrix.version }}'
+          actual="$(pnpm --version)"
+          echo "pnpm version: ${actual}"
+
+          if [ "${required}" = ">=9.15.0" ]; then
+            min="9.15.0"
+            if [ "$(printf '%s\n' "${min}" "${actual}" | sort -V | head -n1)" != "${min}" ]; then
+              echo "Expected pnpm version >= ${min}, but got ${actual}"
+              exit 1
+            fi
+          else
+            if [ "${actual}" != "${required}" ]; then
+              echo "Expected pnpm version ${required}, but got ${actual}"
+              exit 1
+            fi
+          fi
+        shell: bash
+
+  test_run_install:
+    name: 'Test with run_install (${{ matrix.run_install.name }}, ${{ matrix.os }})'
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        pnpm:
+          - 9.15.5
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
         run_install:
           - name: 'null'
             value: 'null'
@@ -270,14 +289,15 @@ jobs:
           version: 9.15.5
           run_install: ${{ matrix.run_install.value }}
 
-      - name: 'Test: pnpm works'
+      - name: 'Test: which'
+        run: which pnpm; which pnpx
+
+      - name: 'Test: version'
         run: |
-          set -e
-          which pnpm
-          which pnpx
           actual="$(pnpm --version)"
-          if [ "${actual}" != "9.15.5" ]; then
+          echo "pnpm version: ${actual}"
-            echo "Expected 9.15.5, got ${actual}"
+          if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
+            echo "ERROR: pnpm --version did not produce valid output"
             exit 1
           fi
         shell: bash

src/index.ts

@@ -8,30 +8,28 @@ import pnpmInstall from './pnpm-install'
 import pruneStore from './pnpm-store-prune'
 
 async function main() {
+  const inputs = getInputs()
+
   if (getState('is_post') === 'true') {
-    await runPost()
+    await runPost(inputs)
   } else {
-    await runMain()
+    await runMain(inputs)
   }
 }
 
-async function runMain() {
+async function runMain(inputs: Inputs) {
-  const inputs = getInputs()
-  saveState('inputs', inputs)
   saveState('is_post', 'true')
 
-  const binDest = await installPnpm(inputs)
+  await installPnpm(inputs)
-  if (binDest === undefined) return
   console.log('Installation Completed!')
-  setOutputs(inputs, binDest)
+  setOutputs(inputs)
 
   await restoreCache(inputs)
 
   pnpmInstall(inputs)
 }
 
-async function runPost() {
+async function runPost(inputs: Inputs) {
-  const inputs = JSON.parse(getState('inputs')) as Inputs
   pruneStore(inputs)
   await saveCache(inputs)
 }

src/install-pnpm/bootstrap/exe-lock.json

@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@pnpm/exe": "11.0.4"
+        "@pnpm/exe": "11.0.0-rc.5"
       }
     },
     "node_modules/@pnpm/exe": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/exe/-/exe-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/exe/-/exe-11.0.0-rc.5.tgz",
-      "integrity": "sha512-3OwYqbbj1KtuUqoMo5OEkY8nU/WutZ7L5ADFl0bbW9oyqU55U37aDqA3NJNSk28CyszNARfrjerAF2DW2TsV7w==",
+      "integrity": "sha512-HT1HxzeFc6RVIMhngQZ7bQgTNzF0IckeFpOvnwCJKfsjfsD/po3LvUVsidCvpALxCWOft1TuBZUkdHq03pEolA==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -28,20 +28,20 @@
         "url": "https://opencollective.com/pnpm"
       },
       "optionalDependencies": {
-        "@pnpm/linux-arm64": "11.0.4",
+        "@pnpm/linux-arm64": "11.0.0-rc.5",
-        "@pnpm/linux-x64": "11.0.4",
+        "@pnpm/linux-x64": "11.0.0-rc.5",
-        "@pnpm/linuxstatic-arm64": "11.0.4",
+        "@pnpm/linuxstatic-arm64": "11.0.0-rc.5",
-        "@pnpm/linuxstatic-x64": "11.0.4",
+        "@pnpm/linuxstatic-x64": "11.0.0-rc.5",
-        "@pnpm/macos-arm64": "11.0.4",
+        "@pnpm/macos-arm64": "11.0.0-rc.5",
-        "@pnpm/macos-x64": "11.0.4",
+        "@pnpm/macos-x64": "11.0.0-rc.5",
-        "@pnpm/win-arm64": "11.0.4",
+        "@pnpm/win-arm64": "11.0.0-rc.5",
-        "@pnpm/win-x64": "11.0.4"
+        "@pnpm/win-x64": "11.0.0-rc.5"
       }
     },
     "node_modules/@pnpm/linux-arm64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/linux-arm64/-/linux-arm64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/linux-arm64/-/linux-arm64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-Bz7V2sFypoGHX/t5w/w7jnCw5DCK3C8s5q8whHJJ3iS5kRznX3Q1F4LwSjjy+lsi777fHyNIvD7qtNmdt9IKoA==",
+      "integrity": "sha512-AreNJJI0r5oEsv5+i+FMVK8AeYs0MpWTGWc2GQwf7qi/w8uA8UxVlIDwhgwY+R6YgdrYVrEjgbU4WcqIqYfgog==",
       "cpu": [
         "arm64"
       ],
@@ -55,9 +55,9 @@
       }
     },
     "node_modules/@pnpm/linux-x64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/linux-x64/-/linux-x64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/linux-x64/-/linux-x64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-u0Yn1gytR1vKdPk6fYF500H8ZWQlj0cTuIQPp+5GYVPkMmA5bSw41RNIDPBfjDlE8ERmQWaQcrgmTcmTZ+n22A==",
+      "integrity": "sha512-NzZPWeIVxCEfQs84wR/O3IND2HSDOClPB2L8vvkWb8KQ4pczOG2x3aNkltXDwYVKxvw4URmwct5u57JGTEvtfg==",
       "cpu": [
         "x64"
       ],
@@ -71,15 +71,12 @@
       }
     },
     "node_modules/@pnpm/linuxstatic-arm64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/linuxstatic-arm64/-/linuxstatic-arm64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/linuxstatic-arm64/-/linuxstatic-arm64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-0aitEcfhWNXNZhfJGt/kJaRvfcdtJzXZpV+toJN94kfawSJnhuawfnUSXMi/3m0G97HkJc7BH8rOz3sojUKt0g==",
+      "integrity": "sha512-xK+U/fJDkvzs4ktswrCZ03cTSEAeFTfgUG88r2J+6JEDGuY/foNOMnnSNOiSplpaufY+Ie+uL+PEDlTyIy46Xg==",
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -90,15 +87,12 @@
       }
     },
     "node_modules/@pnpm/linuxstatic-x64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/linuxstatic-x64/-/linuxstatic-x64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/linuxstatic-x64/-/linuxstatic-x64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-xDJdeJ7D2YvDBy2/IH9lEqMKiSuZiV8190XKWOgQgxUGGeuW4z3j6Ewpl0S5bXsWuNjAgC+uCKp7Qp3P7cXAvw==",
+      "integrity": "sha512-Z1kSilngaM2URfPhBjam/xhMDAn5jl8V0L5CjG/Gg5unmKkipyF93OYMpfnny7A9p1KWi6sNql/KufzUmRP4Eg==",
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -109,9 +103,9 @@
       }
     },
     "node_modules/@pnpm/macos-arm64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/macos-arm64/-/macos-arm64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/macos-arm64/-/macos-arm64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-dNR69jUARtGFuyyLE9VuyxhRUKC8MO/7/xIyAdeIMZAD5ej0Y/Ct0DYCa/FLbgFL1nXaXmp4+gRMfJBkkrKfQQ==",
+      "integrity": "sha512-98p3ilSzkyusC2bxk7Ya34CWt9MeJy/+kpXfwn9YgnOD7GDqCjYY9dlPB9yrkdtKUUMeOIvOuacAQTWnCg2GOQ==",
       "cpu": [
         "arm64"
       ],
@@ -125,9 +119,9 @@
       }
     },
     "node_modules/@pnpm/macos-x64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/macos-x64/-/macos-x64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/macos-x64/-/macos-x64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-RfyrxSBajeEU16dZsgFjbdagDV9F4HNCJfbBgm8IbGjL0+J95naM/VmCDLd6S3+1tISeI2MxtcyCxqjKJsD/BA==",
+      "integrity": "sha512-WZ9UqjTbZN+dMZcy4qaPDsEo4sxTIrw5H+fDvdxT1GUavsf8SBDpvzZMHrGDQ/k22H8oKvPtJ+RGd/Ie5dvbuA==",
       "cpu": [
         "x64"
       ],
@@ -141,9 +135,9 @@
       }
     },
     "node_modules/@pnpm/win-arm64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/win-arm64/-/win-arm64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/win-arm64/-/win-arm64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-fOQEv8b9KxZlUAxPPXSQQUUIrt2nY24Qwd4RzCPpatacBnsE4JIadlr/B4V5z2zFxmV7FdHr7nYUhv2RqTlY/w==",
+      "integrity": "sha512-hxgDmF4xpSVvUPvH+HdMllvHcV2zuYUn/uK182gzFvZ9DE0xEGVj09XaSn5VMbpa32i25oIqaT89QfMcOw/TJg==",
       "cpu": [
         "arm64"
       ],
@@ -157,9 +151,9 @@
       }
     },
     "node_modules/@pnpm/win-x64": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/@pnpm/win-x64/-/win-x64-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/@pnpm/win-x64/-/win-x64-11.0.0-rc.5.tgz",
-      "integrity": "sha512-pErHAV8m3NZuPSeCmH3senTSHX0nwkH5lLzQSpiFuyt08hq8sqL3jDymT4ri9N7ixPN9RFZghZIiT3h+Croaew==",
+      "integrity": "sha512-B1H/6jhzW/6VLr8Bc3zOhMd2P3srANWytuBq0uppR5c7OJwUlqXqJtB6Q4nOEjWYZ2sA5m2xuFiaMeioZiiqgA==",
       "cpu": [
         "x64"
       ],
@@ -230,9 +224,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -249,9 +240,6 @@
       "cpu": [
         "arm64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -268,9 +256,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "glibc"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -287,9 +272,6 @@
       "cpu": [
         "x64"
       ],
-      "libc": [
-        "musl"
-      ],
       "license": "MIT",
       "optional": true,
       "os": [

src/install-pnpm/bootstrap/pnpm-lock.json

@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "pnpm": "11.0.4"
+        "pnpm": "11.0.0-rc.5"
       }
     },
     "node_modules/pnpm": {
-      "version": "11.0.4",
+      "version": "11.0.0-rc.5",
-      "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-11.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-11.0.0-rc.5.tgz",
-      "integrity": "sha512-CjlxZQB6AU7VKRmmHl9GxIubyohATDA+yuzGP2Le9WOJjTxril1epYEes5jP4DqwXaGlzpY/Em1erUwC+TuDww==",
+      "integrity": "sha512-xGn7aqE6meV67JNc17hv9CJwH0YC7KwiMdPcIJEFhuv7a1CntFXQd47CKuVpEtjY6I6fngoDwIdaakF4OpShvQ==",
       "license": "MIT",
       "bin": {
         "pn": "bin/pnpm.mjs",

src/install-pnpm/index.ts

@@ -4,15 +4,13 @@ import runSelfInstaller from './run'
 
 export { runSelfInstaller }
 
-export async function install(inputs: Inputs): Promise<string | undefined> {
+export async function install(inputs: Inputs) {
   startGroup('Running self-installer...')
-  const { exitCode, binDest } = await runSelfInstaller(inputs)
+  const status = await runSelfInstaller(inputs)
   endGroup()
-  if (exitCode) {
+  if (status) {
-    setFailed(`Something went wrong, self-installer exits with code ${exitCode}`)
+    return setFailed(`Something went wrong, self-installer exits with code ${status}`)
-    return undefined
   }
-  return binDest
 }
 
 export default install

src/install-pnpm/run.ts

@@ -12,12 +12,7 @@ import exeLock from './bootstrap/exe-lock.json'
 const BOOTSTRAP_PNPM_PACKAGE_JSON = JSON.stringify({ private: true, dependencies: { pnpm: pnpmLock.packages['node_modules/pnpm'].version } })
 const BOOTSTRAP_EXE_PACKAGE_JSON = JSON.stringify({ private: true, dependencies: { '@pnpm/exe': exeLock.packages['node_modules/@pnpm/exe'].version } })
 
-export interface SelfInstallerResult {
+export async function runSelfInstaller(inputs: Inputs): Promise<number> {
-  exitCode: number
-  binDest: string
-}
-
-export async function runSelfInstaller(inputs: Inputs): Promise<SelfInstallerResult> {
   const { version, dest, packageJsonFile } = inputs
 
   // pnpm v11 requires Node >= 22.13; use standalone (exe) bootstrap which
@@ -50,7 +45,7 @@ export async function runSelfInstaller(inputs: Inputs): Promise<SelfInstallerRes
   const npmEnv = { ...process.env, [pathKey]: currentPath ? currentPath + path.delimiter + nodeDir : nodeDir }
   const npmExitCode = await runCommand('npm', ['ci'], { cwd: dest, env: npmEnv })
   if (npmExitCode !== 0) {
-    return { exitCode: npmExitCode, binDest: path.join(dest, 'node_modules', '.bin') }
+    return npmExitCode
   }
 
   // On Windows with standalone mode, npm's .bin shims can't properly
@@ -84,31 +79,25 @@ export async function runSelfInstaller(inputs: Inputs): Promise<SelfInstallerRes
     ? path.join(dest, 'node_modules', '@pnpm', 'exe', process.platform === 'win32' ? 'pnpm.exe' : 'pnpm')
     : path.join(dest, 'node_modules', 'pnpm', 'bin', 'pnpm.mjs')
 
-  // Self-update the bootstrap to the requested pnpm version. readTargetVersion
+  // Determine the target version
-  // either returns a value or throws, so this always runs.
   const targetVersion = readTargetVersion({ version, packageJsonFile })
+
+  if (targetVersion) {
     const cmd = standalone ? bootstrapPnpm : process.execPath
     const args = standalone ? ['self-update', targetVersion] : [bootstrapPnpm, 'self-update', targetVersion]
     const exitCode = await runCommand(cmd, args, { cwd: dest })
     if (exitCode !== 0) {
-    return { exitCode, binDest: pnpmHome }
+      return exitCode
     }
-  // self-update writes the target pnpm/pnpx into PNPM_HOME/bin, leaving
+  }
-  // the bootstrap symlinks in pnpmHome pointing at the old version. Use
+
-  // PNPM_HOME/bin so consumers of the bin_dest output (e.g.
+  return 0
-  // `${steps.pnpm.outputs.bin_dest}/pnpm`) invoke the requested version.
-  //
-  // When the requested version resolves to the bootstrap version, self-update
-  // is a no-op and PNPM_HOME/bin is not created — fall back to pnpmHome,
-  // whose symlinks already point at the right version.
-  const updatedBinDir = path.join(pnpmHome, 'bin')
-  return { exitCode: 0, binDest: existsSync(updatedBinDir) ? updatedBinDir : pnpmHome }
 }
 
 function readTargetVersion(opts: {
   readonly version?: string | undefined
   readonly packageJsonFile: string
-}): string {
+}): string | undefined {
   const { version, packageJsonFile } = opts
   const { GITHUB_WORKSPACE } = process.env
 
@@ -129,15 +118,12 @@ function readTargetVersion(opts: {
     }
   }
 
-  // packageManager is always exact `pnpm@<version>[+<integrity>]` per spec.
-  // Strip the integrity hash for self-update.
-  const packageManagerVersion =
-    typeof packageManager === 'string' && packageManager.startsWith('pnpm@')
-      ? packageManager.slice('pnpm@'.length).split('+')[0]
-      : undefined
-
   if (version) {
-    if (packageManagerVersion && packageManagerVersion !== version) {
+    if (
+      typeof packageManager === 'string' &&
+      packageManager.startsWith('pnpm@') &&
+      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"
@@ -147,22 +133,13 @@ Remove one of these versions to avoid version mismatch errors like ERR_PNPM_BAD_
     return version
   }
 
-  // Self-update the bootstrap pnpm to the version pinned in package.json so
+  // pnpm will automatically download and switch to the right version
-  // PATH-resolved `pnpm` (and the bin_dest output) reflect the target
+  if (typeof packageManager === 'string' && packageManager.startsWith('pnpm@')) {
-  // version. Without this, `pnpm store path` runs as the bootstrap and
+    return undefined
-  // reports a different STORE_VERSION than the one the user's actual
-  // install writes to — breaking cache: true and actions/setup-node's
-  // `cache: pnpm` on cold caches (issue #233).
-  //
-  // devEngines.packageManager takes priority over packageManager, matching
-  // pnpm's getWantedPackageManager logic. `pnpm self-update` accepts both
-  // exact versions and semver ranges, so we pass either through directly.
-  if (devEngines?.packageManager?.name === 'pnpm' && devEngines.packageManager.version) {
-    return devEngines.packageManager.version
   }
 
-  if (packageManagerVersion) {
+  if (devEngines?.packageManager?.name === 'pnpm' && devEngines.packageManager.version) {
-    return packageManagerVersion
+    return undefined
   }
 
   if (!GITHUB_WORKSPACE) {

src/outputs/index.ts

@@ -1,7 +1,9 @@
 import { setOutput } from '@actions/core'
 import { Inputs } from '../inputs'
+import { getBinDest } from '../utils'
 
-export function setOutputs(inputs: Inputs, binDest: string) {
+export function setOutputs(inputs: Inputs) {
+  const binDest = getBinDest(inputs)
   // NOTE: addPath is already called in installPnpm — do not call it again
   // here, as a second addPath would shadow the correct entry on Windows.
   setOutput('dest', inputs.dest)