Skip to content

fix(build): restore Windows lint and trim the image build context - #5021

Merged
krishicks merged 2 commits into
mainfrom
fix/build-windows-lint-and-docker-context/krishicks
Oct 28, 2026
Merged

krishicks merged 2 commits into
mainfrom
fix/build-windows-lint-and-docker-context/krishicks

Conversation

@krishicks

@krishicks krishicks commented Oct 28, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Fix two build problems on main: the Windows MSVC lint lanes fail, and local image builds send about 15 GB of nested build output as context.

Related Issue

Build fix; no issue (see CONTRIBUTING.md). The Windows lanes fail on main with this function takes 19 arguments but 18 arguments were supplied in openshell-supervisor-network/src/host.rs and Clippy unnecessary_wraps in openshell-server/src/network_trust.rs.

Changes

  • The Windows-only host proxy passes None for the reserved_destination argument that feat(supervisor): relay agent OTLP traces to the collector #4276 added to ProxyHandle::start_with_bind_addr; it hosts no OTLP relay.
  • The Unix-only network supervisor trust artifact helpers allow clippy::unnecessary_wraps on other platforms, as other cfg-dependent helpers do.
  • .dockerignore excluded only the top-level target, so builds from the repository root also sent nested Cargo target directories (e2e/rust, tests/*, examples/*), node_modules, and the .jj store. It now excludes **/target, **/node_modules, and .jj. The images copy only prebuilt binaries from deploy/docker/.build, and e2e/mcp-conformance has its own ignore file.

Testing

  • openshell-server builds on macOS; the Windows lanes on this PR verify the Windows fix, which needs an MSVC host
  • Local build context dropped from about 15 GB to about 257 MB; a Podman e2e run built the gateway and sandbox images with the new ignore rules
  • Unit tests added/updated (if applicable)
  • E2E tests added/updated (if applicable)

Checklist

  • Follows Conventional Commits
  • Commits are signed off (DCO)

The Windows-only host proxy passed 18 arguments to
ProxyHandle::start_with_bind_addr after #4276 added reserved_destination.
It hosts no OTLP relay, so it passes None.

The network supervisor trust artifact helpers only act on Unix, so
Clippy flags their Result as unnecessary on Windows; allow it there, as
other cfg-dependent helpers do.

Signed-off-by: Kris Hicks <khicks@nvidia.com>
.dockerignore excluded only the top-level target directory, so image
builds from the repository root also sent nested Cargo target
directories (e2e/rust, tests, examples), node_modules, and the .jj
store as context: about 15 GB in a local checkout, which a remote
Podman machine copies on every build. Exclude target and node_modules
at any depth, and .jj. The images copy only prebuilt binaries from
deploy/docker/.build.

Signed-off-by: Kris Hicks <khicks@nvidia.com>
@krishicks
krishicks added this pull request to the merge queue Oct 28, 2026
Merged via the queue into main with commit 677875f Oct 28, 2026
84 of 85 checks passed
@krishicks
krishicks deleted the fix/build-windows-lint-and-docker-context/krishicks branch October 28, 2026 23:29
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.

2 participants