fix(ci): keep Docker patch smoke on pnpm workspace config · openclaw/openclaw@d22424f

Recent Commits to openclaw:main

altaywtf · 2026-05-11 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,9 @@ jobs:`
`137`	`137`	`node -e "`
`138`	`138`	`const fs = require(\"node:fs\");`
`139`	`139`	`const path = require(\"node:path\");`
`140`		`- const pkg = require(\"/app/package.json\");`
`141`		`- for (const [dep, rel] of Object.entries(pkg.pnpm?.patchedDependencies ?? {})) {`
	`140`	`+ const YAML = require(\"yaml\");`
	`141`	`+ const workspace = YAML.parse(fs.readFileSync(\"/app/pnpm-workspace.yaml\", \"utf8\")) ?? {};`
	`142`	`+ for (const [dep, rel] of Object.entries(workspace.patchedDependencies ?? {})) {`
`142`	`143`	`const absolute = path.join(\"/app\", rel);`
`143`	`144`	`if (!fs.existsSync(absolute)) {`
`144`	`145`	throw new Error(`missing patch for ${dep}: ${rel}`);
`@@ -321,7 +322,22 @@ jobs:`
`321`	`322`	`env:`
`322`	`323`	`IMAGE_REF: ${{ needs.root_dockerfile_image.outputs.image_ref }}`
`323`	`324`	`run: \|`
`324`		`- docker run --rm --entrypoint sh "$IMAGE_REF" -lc 'which openclaw && openclaw --version'`
	`325`	`+ docker run --rm --entrypoint sh "$IMAGE_REF" -lc '`
	`326`	`+ which openclaw &&`
	`327`	`+ openclaw --version &&`
	`328`	`+ node -e "`
	`329`	`+ const fs = require(\"node:fs\");`
	`330`	`+ const path = require(\"node:path\");`
	`331`	`+ const YAML = require(\"yaml\");`
	`332`	`+ const workspace = YAML.parse(fs.readFileSync(\"/app/pnpm-workspace.yaml\", \"utf8\")) ?? {};`
	`333`	`+ for (const [dep, rel] of Object.entries(workspace.patchedDependencies ?? {})) {`
	`334`	`+ const absolute = path.join(\"/app\", rel);`
	`335`	`+ if (!fs.existsSync(absolute)) {`
	`336`	+ throw new Error(`missing patch for ${dep}: ${rel}`);
	`337`	`+ }`
	`338`	`+ }`
	`339`	`+ "`
	`340`	`+ '`
`325`	`341`
`326`	`342`	`- name: Run agents delete shared workspace Docker CLI smoke`
`327`	`343`	`env:`

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ RUN chown node:node /app`
`168`	`168`	`COPY --from=runtime-assets --chown=node:node /app/dist ./dist`
`169`	`169`	`COPY --from=runtime-assets --chown=node:node /app/node_modules ./node_modules`
`170`	`170`	`COPY --from=runtime-assets --chown=node:node /app/package.json .`
	`171`	`+COPY --from=runtime-assets --chown=node:node /app/pnpm-workspace.yaml .`
`171`	`172`	`COPY --from=runtime-assets --chown=node:node /app/patches ./patches`
`172`	`173`	`COPY --from=runtime-assets --chown=node:node /app/openclaw.mjs .`
`173`	`174`	`COPY --from=runtime-assets --chown=node:node /app/${OPENCLAW_BUNDLED_PLUGIN_DIR} ./${OPENCLAW_BUNDLED_PLUGIN_DIR}`

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,9 @@ describe("Dockerfile", () => {`
`134`	`134`	`expect(dockerfile).toContain(`
`135`	`135`	`"COPY --from=runtime-assets --chown=node:node /app/node_modules ./node_modules",`
`136`	`136`	`);`
	`137`	`+expect(dockerfile).toContain(`
	`138`	`+"COPY --from=runtime-assets --chown=node:node /app/pnpm-workspace.yaml .",`
	`139`	`+);`
`137`	`140`	`expect(dockerfile).toContain(`
`138`	`141`	`"COPY --from=runtime-assets --chown=node:node /app/patches ./patches",`
`139`	`142`	`);`
`@@ -146,6 +149,9 @@ describe("Dockerfile", () => {`
`146`	`149`	`};`
`147`	`150`
`148`	`151`	`expect(Object.keys(pnpmWorkspace.patchedDependencies ?? {})).not.toHaveLength(0);`
	`152`	`+expect(dockerfile).toContain(`
	`153`	`+"COPY --from=runtime-assets --chown=node:node /app/pnpm-workspace.yaml .",`
	`154`	`+);`
`149`	`155`	`expect(dockerfile).toContain(`
`150`	`156`	`"COPY --from=runtime-assets --chown=node:node /app/patches ./patches",`
`151`	`157`	`);`

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ describe("pi package graph guardrails", () => {`
`89`	`89`
`90`	`90`	`expectNoGraphViolations(`
`91`	`91`	`piOverrides,`
`92`		-`pnpm.overrides must not target Pi packages. Found: ${piOverrides.join(", ") \|\| "<none>"}. Pi-specific overrides can silently create an unsupported package graph.`,
	`92`	+`pnpm-workspace.yaml overrides must not target Pi packages. Found: ${piOverrides.join(", ") \|\| "<none>"}. Pi-specific overrides can silently create an unsupported package graph.`,
`93`	`93`	`);`
`94`	`94`	`});`
`95`	`95`	`});`

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,9 @@ describe("bun global install smoke", () => {`
`229`	`229`	`expect(workflow).not.toContain('timeout 300s docker pull "$IMAGE_REF"');`
`230`	`230`	`expect(workflow).toContain("--progress=plain");`
`231`	`231`	`expect(workflow).toContain("--load");`
	`232`	`+expect(workflow).toContain("pnpm-workspace.yaml");`
	`233`	`+expect(workflow).toContain("workspace.patchedDependencies");`
	`234`	`+expect(workflow).not.toContain("pkg.pnpm?.patchedDependencies");`
`232`	`235`	`expect(workflow).not.toContain("--cache-from");`
`233`	`236`	`expect(workflow).not.toContain("--cache-to");`
`234`	`237`	`expect(workflow).not.toContain("type=gha");`

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

推荐订阅源

Recent Commits to openclaw:main