Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
collissimo merged 1 commit into from
Nov 6, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion fork/resolve-merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ if [[ ${#unresolved[@]} -gt 0 ]]; then
fi

# Without the repository's commit hooks: they would lint the whole merge on the commit below.
VP_GIT_HOOKS=0 vp install
# pnpm freezes the lockfile under CI, which would refuse the fork's additions to upstream's.
VP_GIT_HOOKS=0 vp install --no-frozen-lockfile

# A clean textual merge can still break the build: one side calls what the other renamed or
# stopped importing, in a file git merged without a conflict. And collin/main itself may not
Expand Down
7 changes: 6 additions & 1 deletion fork/resolve-merge.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@ failed=0

mkdir "$root/bin"
# Reports whatever $TSC_LINE says while the file it names (relative to the app) holds BROKEN.
# Installs like pnpm in CI: the lockfile is frozen unless the call says otherwise.
cat > "$root/bin/vp" <<'STUB'
#!/usr/bin/env bash
if [[ "$1" == install && -n "${CI:-}" && " $* " != *" --no-frozen-lockfile "* ]]; then
echo "Error: ERR_PNPM_OUTDATED_LOCKFILE" >&2
exit 1
fi
[[ "$1" == run && "$(basename "$PWD")" == server ]] || exit 0
if grep -rqs BROKEN src ../../packages; then
printf '~/apps/server$ tsc --noEmit\n%b\n' "$TSC_LINE"
Expand All @@ -24,7 +29,7 @@ for file in $(git diff --name-only --diff-filter=U); do git rm -q -f -- "$file";
grep -rl BROKEN apps packages | xargs -r sed -i 's/BROKEN/fixed/'
STUB
chmod +x "$root/bin/vp" "$root/bin/claude"
export PATH="$root/bin:$PATH" CLAUDE_CODE_OAUTH_TOKEN=test
export PATH="$root/bin:$PATH" CLAUDE_CODE_OAUTH_TOKEN=test CI=true

new_repo() {
git init -q -b base "$1"
Expand Down
Loading