diff --git a/README.md b/README.md index a6351b5..ed8f220 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ with a working `--version`, so the runtime is directly verifiable. |---|---| | Layer / candy | `nodejs` | | Binaries | `/usr/bin/node`, `/usr/bin/npm`, `/usr/local/bin/pnpm` | -| Pinned pnpm | `PNPM_VERSION` `10.33.4` | +| Pinned pnpm | `PNPM_VERSION` `10.34.6` | | Env | `NPM_CONFIG_PREFIX=~/.npm-global`; `~/.npm-global/bin` on `PATH` | | Service / port | none | diff --git a/charly.yml b/charly.yml index 804246d..9805ccc 100644 --- a/charly.yml +++ b/charly.yml @@ -57,7 +57,7 @@ nodejs: suite: nodistro components: main var: - PNPM_VERSION: "10.33.4" + PNPM_VERSION: "10.34.6" plan: - run: | command=case "${BUILD_ARCH}" in @@ -118,6 +118,17 @@ nodejs: # with it and hand the result to env(1). command: | env HOME="$(getent passwd "$(id -u)" | cut -d: -f6)" pnpm --version + - # The pnpm floor consumers depend on: 10.33.4 cannot accept the + # fully-qualified `allowBuilds` key that pnpm itself prints for a + # git-hosted dependency (ERR_PNPM_INVALID_VERSION_UNION), which breaks + # a DSH profile installing its git-hosted plugins (pod-dsh's dsh-web), + # and it ships no node-gyp for native addon builds. Assert the installed + # binary is at least 10.34.6 so a regression of PNPM_VERSION fails THIS + # check (it passes at 10.34.6, fails at 10.33.4). + check: the installed pnpm is at least 10.34.6 (the git-hosted allowBuilds key floor) + exit_status: 0 + command: | + env HOME="$(getent passwd "$(id -u)" | cut -d: -f6)" pnpm --version | node -e 'let s="";process.stdin.on("data",d=>s+=d).on("end",()=>{const [maj,min]=s.trim().split(".").map(Number);if(maj>10||(maj===10&&min>=34))process.exit(0);process.exit(1)})' - check: package=nodejs id: nodejs-package package: