Skip to content

fix(fork): the release build regenerates the lockfile a merge changed - #33

Merged
collissimo merged 1 commit into
collin/mainfrom
fork-repair/42233693866
Nov 6, 2026
Merged

collissimo merged 1 commit into
collin/mainfrom
fork-repair/42233693866

Conversation

@collissimo

Copy link
Copy Markdown
Owner

Every Fork release since 2026-11-05 (latest red run 42233693866) failed after the merge conflicts were resolved: resolve-merge.sh takes upstream's pnpm-lock.yaml and relies on vp install to add the fork's dependencies (koffi), but pnpm freezes the lockfile under CI, so the install stopped with ERR_PNPM_OUTDATED_LOCKFILE.

The script now runs vp install --no-frozen-lockfile; the regenerated lockfile is committed into the build merge as before, so the build jobs' frozen install matches it. fork/resolve-merge.test.sh runs with CI=true and its vp stub refuses a frozen install, so all five cases fail without the fix and pass with it.

Done by Claude Opus 5.5 in Claude Code (T3 Code).

🤖 Generated with Claude Code

Since upstream's nightly conflicts in pnpm-lock.yaml, every Fork release failed with
ERR_PNPM_OUTDATED_LOCKFILE: resolve-merge.sh takes upstream's lockfile and expects
`vp install` to add the fork's dependencies (koffi), but pnpm freezes the lockfile
under CI. It now installs with --no-frozen-lockfile.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@collissimo
collissimo merged commit 919a56f into collin/main Nov 6, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant