Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

Expand Down
15 changes: 14 additions & 1 deletion charly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -118,6 +118,19 @@ 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. ALL THREE components are compared, not just major.minor: a
# `10.34.x<6` pin must fail too, or the guard would not enforce the
# stated floor.
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 v=s.trim().split(".").map(Number);if(v[0]>10||(v[0]===10&&(v[1]>34||(v[1]===34&&v[2]>=6))))process.exit(0);process.exit(1)})'
- check: package=nodejs
id: nodejs-package
package:
Expand Down
Loading