pnpm/action-setup
1
0
Fork 0
mirror of https://github.com/pnpm/action-setup.git synced 2026-04-05 04:00:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: address review feedback — PATH ordering and regex anchoring

Browse Source 
- Swap addPath order so pnpmHome (with pnpm.exe) is prepended last
  and has highest precedence over pnpmHome/bin.
- Anchor version regex with $ and allow prerelease suffixes.
This commit is contained in:
Zoltan Kochan
2026-03-27 20:38:35 +01:00
parent 825c5d3936
commit 19566048c2
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/test.yaml vendored
View File

@@ -36,7 +36,7 @@ jobs:
run: | run: |
actual="$(pnpm --version)" actual="$(pnpm --version)"
echo "pnpm version: ${actual}" echo "pnpm version: ${actual}"
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
echo "ERROR: pnpm --version did not produce valid output" echo "ERROR: pnpm --version did not produce valid output"
exit 1 exit 1
fi fi
@@ -81,7 +81,7 @@ jobs:
run: | run: |
actual="$(pnpm --version)" actual="$(pnpm --version)"
echo "pnpm version: ${actual}" echo "pnpm version: ${actual}"
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
echo "ERROR: pnpm --version did not produce valid output" echo "ERROR: pnpm --version did not produce valid output"
exit 1 exit 1
fi fi
@@ -115,7 +115,7 @@ jobs:
run: | run: |
actual="$(pnpm --version)" actual="$(pnpm --version)"
echo "pnpm version: ${actual}" echo "pnpm version: ${actual}"
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
echo "ERROR: pnpm --version did not produce valid output" echo "ERROR: pnpm --version did not produce valid output"
exit 1 exit 1
fi fi
@@ -220,7 +220,7 @@ jobs:
run: | run: |
actual="$(pnpm --version)" actual="$(pnpm --version)"
echo "pnpm version: ${actual}" echo "pnpm version: ${actual}"
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
echo "ERROR: pnpm --version did not produce valid output" echo "ERROR: pnpm --version did not produce valid output"
exit 1 exit 1
fi fi

2
dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

7
src/install-pnpm/run.ts
View File

@@ -40,12 +40,13 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
const pnpmHome = standalone && process.platform === 'win32' const pnpmHome = standalone && process.platform === 'win32'
? path.join(dest, 'node_modules', '@pnpm', 'exe') ? path.join(dest, 'node_modules', '@pnpm', 'exe')
: path.join(dest, 'node_modules', '.bin') : path.join(dest, 'node_modules', '.bin')
// pnpm expects PNPM_HOME/bin in PATH for global binaries (e.g. node
// installed via `pnpm runtime`). Add it first so the next addPath
// (pnpmHome itself, which contains pnpm.exe) has higher precedence.
addPath(path.join(pnpmHome, 'bin'))
addPath(pnpmHome) addPath(pnpmHome)
exportVariable('PNPM_HOME', pnpmHome) exportVariable('PNPM_HOME', pnpmHome)
// pnpm expects PNPM_HOME/bin in PATH for global binaries
addPath(path.join(pnpmHome, 'bin'))
// Ensure pnpm bin link exists — npm ci sometimes doesn't create it // Ensure pnpm bin link exists — npm ci sometimes doesn't create it
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
const pnpmBinLink = path.join(dest, 'node_modules', '.bin', 'pnpm') const pnpmBinLink = path.join(dest, 'node_modules', '.bin', 'pnpm')