fix: scope git installer lockfile refresh · openclaw/openclaw@b26dcb3

Recent Commits to openclaw:main

keshavbotage · 2026-05-15 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -414,16 +414,17 @@ checkout_git_openclaw_ref() {`
`414`	`414`	`return 0`
`415`	`415`	`fi`
`416`	`416`
`417`		`- git -C "$repo_dir" fetch --tags origin`
`418`		`-`
`419`	`417`	`if [[ "$ref" == "main" ]]; then`
	`418`	`+ git -C "$repo_dir" fetch --no-tags origin main`
`420`	`419`	`git -C "$repo_dir" checkout main`
`421`	`420`	`if [[ "$GIT_UPDATE" == "1" ]]; then`
`422`		`- git -C "$repo_dir" pull --rebase \|\| true`
	`421`	`+ git -C "$repo_dir" pull --rebase --no-tags \|\| true`
`423`	`422`	`fi`
`424`	`423`	`return 0`
`425`	`424`	`fi`
`426`	`425`
	`426`	`+ git -C "$repo_dir" fetch --tags origin`
	`427`	`+`
`427`	`428`	`if git -C "$repo_dir" rev-parse --verify --quiet "refs/tags/${ref}^{commit}" >/dev/null; then`
`428`	`429`	`git -C "$repo_dir" checkout --detach "$ref"`
`429`	`430`	`return 0`
`@@ -445,6 +446,18 @@ checkout_git_openclaw_ref() {`
`445`	`446`	`fail "Requested git version not found: ${ref}"`
`446`	`447`	`}`
`447`	`448`
	`449`	`+git_install_lockfile_flag() {`
	`450`	`+local repo_dir="$1"`
	`451`	`+local ref="$2"`
	`452`	`+`
	`453`	`+if [[ "$ref" == "main" ]] \|\| git -C "$repo_dir" ls-remote --exit-code --heads origin "$ref" >/dev/null 2>&1; then`
	`454`	`+echo "--no-frozen-lockfile"`
	`455`	`+return 0`
	`456`	`+fi`
	`457`	`+`
	`458`	`+echo "--frozen-lockfile"`
	`459`	`+}`
	`460`	`+`
`448`	`461`	`repo_pnpm_spec() {`
`449`	`462`	`local repo_dir="$1"`
`450`	`463`	`local package_json="${repo_dir}/package.json"`
`@@ -723,7 +736,9 @@ install_openclaw_from_git() {`
`723`	`736`	`ensure_pnpm_git_prepare_allowlist "$repo_dir"`
`724`	`737`	`activate_repo_pnpm_version "$repo_dir"`
`725`	`738`
`726`		`- SHARP_IGNORE_GLOBAL_LIBVIPS="$SHARP_IGNORE_GLOBAL_LIBVIPS" run_pnpm -C "$repo_dir" install --frozen-lockfile`
	`739`	`+local install_lockfile_flag`
	`740`	`+ install_lockfile_flag="$(git_install_lockfile_flag "$repo_dir" "$git_ref")"`
	`741`	`+ CI="${CI:-true}" SHARP_IGNORE_GLOBAL_LIBVIPS="$SHARP_IGNORE_GLOBAL_LIBVIPS" run_pnpm -C "$repo_dir" install "$install_lockfile_flag"`
`727`	`742`
`728`	`743`	`if ! run_pnpm -C "$repo_dir" ui:build; then`
`729`	`744`	`log "UI build failed; continuing (CLI may still work)"`

Original file line number	Diff line number	Diff line change
`@@ -1993,6 +1993,18 @@ checkout_git_openclaw_ref() {`
`1993`	`1993`	`return 1`
`1994`	`1994`	`}`
`1995`	`1995`
	`1996`	`+git_install_lockfile_flag() {`
	`1997`	`+local repo_dir="$1"`
	`1998`	`+local ref="$2"`
	`1999`	`+`
	`2000`	`+if [[ "$ref" == "main" ]] \|\| git -C "$repo_dir" ls-remote --exit-code --heads origin "$ref" >/dev/null 2>&1; then`
	`2001`	`+echo "--no-frozen-lockfile"`
	`2002`	`+return 0`
	`2003`	`+fi`
	`2004`	`+`
	`2005`	`+echo "--frozen-lockfile"`
	`2006`	`+}`
	`2007`	`+`
`1996`	`2008`	`repo_pnpm_spec() {`
`1997`	`2009`	`local repo_dir="$1"`
`1998`	`2010`	`local package_json="${repo_dir}/package.json"`
`@@ -2369,7 +2381,9 @@ install_openclaw_from_git() {`
`2369`	`2381`	`cleanup_legacy_submodules "$repo_dir"`
`2370`	`2382`	`activate_repo_pnpm_version "$repo_dir"`
`2371`	`2383`
`2372`		`- CI="${CI:-true}" SHARP_IGNORE_GLOBAL_LIBVIPS="$SHARP_IGNORE_GLOBAL_LIBVIPS" run_quiet_step "Installing dependencies" run_pnpm -C "$repo_dir" install --no-frozen-lockfile`
	`2384`	`+local install_lockfile_flag`
	`2385`	`+ install_lockfile_flag="$(git_install_lockfile_flag "$repo_dir" "$git_ref")"`
	`2386`	`+ CI="${CI:-true}" SHARP_IGNORE_GLOBAL_LIBVIPS="$SHARP_IGNORE_GLOBAL_LIBVIPS" run_quiet_step "Installing dependencies" run_pnpm -C "$repo_dir" install "$install_lockfile_flag"`
`2373`	`2387`
`2374`	`2388`	`if ! run_quiet_step "Building UI" run_pnpm -C "$repo_dir" ui:build; then`
`2375`	`2389`	`ui_warn "UI build failed; continuing (CLI may still work)"`

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,33 @@ describe("install-cli.sh", () => {`
`47`	`47`	`expect(result.stdout).toContain("main=main");`
`48`	`48`	`});`
`49`	`49`
`50`		`-it("uses frozen lockfile installs for git installs", () => {`
`51`		`-expect(script).toContain('run_pnpm -C "$repo_dir" install --frozen-lockfile');`
	`50`	`+it("fetches main without tags for git installs", () => {`
	`51`	`+expect(script).toContain('git -C "$repo_dir" fetch --no-tags origin main');`
	`52`	`+expect(script).toContain('git -C "$repo_dir" pull --rebase --no-tags \|\| true');`
	`53`	`+});`
	`54`	`+`
	`55`	`+it("uses non-frozen lockfile installs only for moving git refs", () => {`
	`56`	+const result = runInstallCliShell(`
	`57`	`+ set -euo pipefail`
	`58`	`+ source "${SCRIPT_PATH}"`
	`59`	`+ git() {`
	`60`	`+ if [[ "$1" == "-C" && "$3" == "ls-remote" && "\${7:-}" == "feature" ]]; then`
	`61`	`+ return 0`
	`62`	`+ fi`
	`63`	`+ return 1`
	`64`	`+ }`
	`65`	`+ printf 'main=%s\\n' "$(git_install_lockfile_flag /repo main)"`
	`66`	`+ printf 'branch=%s\\n' "$(git_install_lockfile_flag /repo feature)"`
	`67`	`+ printf 'tag=%s\\n' "$(git_install_lockfile_flag /repo v2026.5.12)"`
	`68`	+ `);
	`69`	`+`
	`70`	`+expect(result.status).toBe(0);`
	`71`	`+expect(result.stdout).toContain("main=--no-frozen-lockfile");`
	`72`	`+expect(result.stdout).toContain("branch=--no-frozen-lockfile");`
	`73`	`+expect(result.stdout).toContain("tag=--frozen-lockfile");`
	`74`	`+expect(script).toContain(`
	`75`	`+'CI="${CI:-true}" SHARP_IGNORE_GLOBAL_LIBVIPS="$SHARP_IGNORE_GLOBAL_LIBVIPS" run_pnpm -C "$repo_dir" install "$install_lockfile_flag"',`
	`76`	`+);`
`52`	`77`	`});`
`53`	`78`
`54`	`79`	`it("aligns pnpm to the checked-out repo packageManager before installing", () => {`

Original file line number	Diff line number	Diff line change
`@@ -381,9 +381,32 @@ describe("install.sh", () => {`
`381`	`381`	`expect(result.stdout).toContain("main=main");`
`382`	`382`	`});`
`383`	`383`
`384`		`-it("uses frozen lockfile installs for git installs", () => {`
	`384`	`+it("fetches main without tags for git installs", () => {`
	`385`	`+expect(script).toContain('git -C "$repo_dir" fetch --no-tags origin main');`
	`386`	`+expect(script).toContain('git -C "$repo_dir" pull --rebase --no-tags \|\| true');`
	`387`	`+});`
	`388`	`+`
	`389`	`+it("uses non-frozen lockfile installs only for moving git refs", () => {`
	`390`	+const result = runInstallShell(`
	`391`	`+ set -euo pipefail`
	`392`	`+ source "${SCRIPT_PATH}"`
	`393`	`+ git() {`
	`394`	`+ if [[ "$1" == "-C" && "$3" == "ls-remote" && "\${7:-}" == "feature" ]]; then`
	`395`	`+ return 0`
	`396`	`+ fi`
	`397`	`+ return 1`
	`398`	`+ }`
	`399`	`+ printf 'main=%s\\n' "$(git_install_lockfile_flag /repo main)"`
	`400`	`+ printf 'branch=%s\\n' "$(git_install_lockfile_flag /repo feature)"`
	`401`	`+ printf 'tag=%s\\n' "$(git_install_lockfile_flag /repo v2026.5.12)"`
	`402`	+ `);
	`403`	`+`
	`404`	`+expect(result.status).toBe(0);`
	`405`	`+expect(result.stdout).toContain("main=--no-frozen-lockfile");`
	`406`	`+expect(result.stdout).toContain("branch=--no-frozen-lockfile");`
	`407`	`+expect(result.stdout).toContain("tag=--frozen-lockfile");`
`385`	`408`	`expect(script).toContain(`
`386`		`-'run_quiet_step "Installing dependencies" run_pnpm -C "$repo_dir" install --frozen-lockfile',`
	`409`	`+'CI="${CI:-true}" SHARP_IGNORE_GLOBAL_LIBVIPS="$SHARP_IGNORE_GLOBAL_LIBVIPS" run_quiet_step "Installing dependencies" run_pnpm -C "$repo_dir" install "$install_lockfile_flag"',`
`387`	`410`	`);`
`388`	`411`	`});`
`389`	`412`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main