fix(ci): the wasm check and the docker fetch stages pass again
privacy.rs bound the opened handle in a name only the unix build used, so `-D warnings` failed the wasm target; the bind is now `_file` and the unix branch uses it. The docker images resolve the whole workspace manifest graph before `cargo fetch`, so they now copy the tools contract with its workspace root plus the sandbox manifests rhema-code path-depends on, and the stub loop covers tools/*/ too.
This commit is contained in:
1 parent
5e9952ac6d
commit
18d58ea8a4
2 files changed
+23
-2
No files matched your search
@@ -28,10 +28,22 @@ COPY crates/rhema-provider-llama-cpp/Cargo.toml crates/rhema-provider-llama-cpp/
|
|||||||
COPY crates/rhema-provider-openai-compatible/Cargo.toml crates/rhema-provider-openai-compatible/Cargo.toml
|
COPY crates/rhema-provider-openai-compatible/Cargo.toml crates/rhema-provider-openai-compatible/Cargo.toml
|
||||||
COPY crates/rhema-provider-openrouter/Cargo.toml crates/rhema-provider-openrouter/Cargo.toml
|
COPY crates/rhema-provider-openrouter/Cargo.toml crates/rhema-provider-openrouter/Cargo.toml
|
||||||
COPY crates/rhema-rsd/Cargo.toml crates/rhema-rsd/Cargo.toml
|
COPY crates/rhema-rsd/Cargo.toml crates/rhema-rsd/Cargo.toml
|
||||||
|
COPY crates/rhema-sandbox/Cargo.toml crates/rhema-sandbox/Cargo.toml
|
||||||
|
COPY crates/rhema-sandbox-docker/Cargo.toml crates/rhema-sandbox-docker/Cargo.toml
|
||||||
|
COPY crates/rhema-sandbox-http/Cargo.toml crates/rhema-sandbox-http/Cargo.toml
|
||||||
|
COPY crates/rhema-sandbox-ssh/Cargo.toml crates/rhema-sandbox-ssh/Cargo.toml
|
||||||
COPY crates/rhema-subagents/Cargo.toml crates/rhema-subagents/Cargo.toml
|
COPY crates/rhema-subagents/Cargo.toml crates/rhema-subagents/Cargo.toml
|
||||||
COPY crates/rhema-transcript/Cargo.toml crates/rhema-transcript/Cargo.toml
|
COPY crates/rhema-transcript/Cargo.toml crates/rhema-transcript/Cargo.toml
|
||||||
COPY integrations/rhema-calendar-integration/Cargo.toml integrations/rhema-calendar-integration/Cargo.toml
|
COPY integrations/rhema-calendar-integration/Cargo.toml integrations/rhema-calendar-integration/Cargo.toml
|
||||||
COPY integrations/rhema-forge-integration/Cargo.toml integrations/rhema-forge-integration/Cargo.toml
|
COPY integrations/rhema-forge-integration/Cargo.toml integrations/rhema-forge-integration/Cargo.toml
|
||||||
|
# rhema-claw path-depends on the tools contract, which lives in its own
|
||||||
|
# workspace: the member manifests inherit from that root, so the root
|
||||||
|
# rides along with them.
|
||||||
|
COPY tools/Cargo.toml tools/Cargo.toml
|
||||||
|
COPY tools/contract/Cargo.toml tools/contract/Cargo.toml
|
||||||
|
COPY tools/common/Cargo.toml tools/common/Cargo.toml
|
||||||
|
COPY tools/notify/Cargo.toml tools/notify/Cargo.toml
|
||||||
|
|
||||||
|
|
||||||
# Resolution reads the vendored crossterm (the root manifest path-patches
|
# Resolution reads the vendored crossterm (the root manifest path-patches
|
||||||
# to it) even though the image builds the daemon, which does not link it.
|
# to it) even though the image builds the daemon, which does not link it.
|
||||||
@@ -46,7 +58,7 @@ COPY vendor/ vendor/
|
|||||||
# unmatched glob would hand mkdir a literal path. The real sources land
|
# unmatched glob would hand mkdir a literal path. The real sources land
|
||||||
# below. (The awk program must stay on one line: a Dockerfile line not
|
# below. (The awk program must stay on one line: a Dockerfile line not
|
||||||
# ending in a backslash ends the RUN.)
|
# ending in a backslash ends the RUN.)
|
||||||
RUN for crate in crates/*/ integrations/*/; do \
|
RUN for crate in crates/*/ integrations/*/ tools/*/; do \
|
||||||
mkdir -p "$crate/src"; \
|
mkdir -p "$crate/src"; \
|
||||||
touch "$crate/src/lib.rs" "$crate/src/main.rs"; \
|
touch "$crate/src/lib.rs" "$crate/src/main.rs"; \
|
||||||
awk -F'"' '/^\[/ { d = ""; p = 0; if ($0 == "[[example]]") { d = "examples" } else if ($0 == "[[test]]") { d = "tests" } else if ($0 == "[[bench]]") { d = "benches" }; next } d == "" { next } /^name = / && p == 0 { print d "/" $2 ".rs" } /^path = / { p = 1; print $2 }' "$crate/Cargo.toml" \
|
awk -F'"' '/^\[/ { d = ""; p = 0; if ($0 == "[[example]]") { d = "examples" } else if ($0 == "[[test]]") { d = "tests" } else if ($0 == "[[bench]]") { d = "benches" }; next } d == "" { next } /^name = / && p == 0 { print d "/" $2 ".rs" } /^path = / { p = 1; print $2 }' "$crate/Cargo.toml" \
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ COPY crates/rhema-provider-llama-cpp/Cargo.toml crates/rhema-provider-llama-cpp/
|
|||||||
COPY crates/rhema-provider-openai-compatible/Cargo.toml crates/rhema-provider-openai-compatible/Cargo.toml
|
COPY crates/rhema-provider-openai-compatible/Cargo.toml crates/rhema-provider-openai-compatible/Cargo.toml
|
||||||
COPY crates/rhema-provider-openrouter/Cargo.toml crates/rhema-provider-openrouter/Cargo.toml
|
COPY crates/rhema-provider-openrouter/Cargo.toml crates/rhema-provider-openrouter/Cargo.toml
|
||||||
COPY crates/rhema-rsd/Cargo.toml crates/rhema-rsd/Cargo.toml
|
COPY crates/rhema-rsd/Cargo.toml crates/rhema-rsd/Cargo.toml
|
||||||
|
COPY crates/rhema-sandbox/Cargo.toml crates/rhema-sandbox/Cargo.toml
|
||||||
COPY crates/rhema-sandbox-docker/Cargo.toml crates/rhema-sandbox-docker/Cargo.toml
|
COPY crates/rhema-sandbox-docker/Cargo.toml crates/rhema-sandbox-docker/Cargo.toml
|
||||||
COPY crates/rhema-sandbox-http/Cargo.toml crates/rhema-sandbox-http/Cargo.toml
|
COPY crates/rhema-sandbox-http/Cargo.toml crates/rhema-sandbox-http/Cargo.toml
|
||||||
COPY crates/rhema-sandbox-local/Cargo.toml crates/rhema-sandbox-local/Cargo.toml
|
COPY crates/rhema-sandbox-local/Cargo.toml crates/rhema-sandbox-local/Cargo.toml
|
||||||
@@ -42,6 +43,14 @@ COPY crates/rhema-transcript/Cargo.toml crates/rhema-transcript/Cargo.toml
|
|||||||
COPY crates/rhema-vercel-agent/Cargo.toml crates/rhema-vercel-agent/Cargo.toml
|
COPY crates/rhema-vercel-agent/Cargo.toml crates/rhema-vercel-agent/Cargo.toml
|
||||||
COPY integrations/rhema-calendar-integration/Cargo.toml integrations/rhema-calendar-integration/Cargo.toml
|
COPY integrations/rhema-calendar-integration/Cargo.toml integrations/rhema-calendar-integration/Cargo.toml
|
||||||
COPY integrations/rhema-forge-integration/Cargo.toml integrations/rhema-forge-integration/Cargo.toml
|
COPY integrations/rhema-forge-integration/Cargo.toml integrations/rhema-forge-integration/Cargo.toml
|
||||||
|
# rhema-claw path-depends on the tools contract, which lives in its own
|
||||||
|
# workspace: the member manifests inherit from that root, so the root
|
||||||
|
# rides along with them.
|
||||||
|
COPY tools/Cargo.toml tools/Cargo.toml
|
||||||
|
COPY tools/contract/Cargo.toml tools/contract/Cargo.toml
|
||||||
|
COPY tools/common/Cargo.toml tools/common/Cargo.toml
|
||||||
|
COPY tools/notify/Cargo.toml tools/notify/Cargo.toml
|
||||||
|
|
||||||
|
|
||||||
# Resolution reads the vendored crossterm (the root manifest path-patches
|
# Resolution reads the vendored crossterm (the root manifest path-patches
|
||||||
# to it) even though the image builds the daemon, which does not link it.
|
# to it) even though the image builds the daemon, which does not link it.
|
||||||
@@ -63,7 +72,7 @@ COPY vendor/ vendor/
|
|||||||
# rhema-sandbox-server, were the stub not skipped. Declared [[bin]]
|
# rhema-sandbox-server, were the stub not skipped. Declared [[bin]]
|
||||||
# paths are never stubbed either — the awk stubs examples/tests/benches
|
# paths are never stubbed either — the awk stubs examples/tests/benches
|
||||||
# only — and fetch needs no bin to exist.
|
# only — and fetch needs no bin to exist.
|
||||||
RUN for crate in crates/*/ integrations/*/; do \
|
RUN for crate in crates/*/ integrations/*/ tools/*/; do \
|
||||||
mkdir -p "$crate/src"; \
|
mkdir -p "$crate/src"; \
|
||||||
touch "$crate/src/lib.rs"; \
|
touch "$crate/src/lib.rs"; \
|
||||||
awk -F'"' '/^\[/ { d = ""; p = 0; if ($0 == "[[example]]") { d = "examples" } else if ($0 == "[[test]]") { d = "tests" } else if ($0 == "[[bench]]") { d = "benches" }; next } d == "" { next } /^name = / && p == 0 { print d "/" $2 ".rs" } /^path = / { p = 1; print $2 }' "$crate/Cargo.toml" \
|
awk -F'"' '/^\[/ { d = ""; p = 0; if ($0 == "[[example]]") { d = "examples" } else if ($0 == "[[test]]") { d = "tests" } else if ($0 == "[[bench]]") { d = "benches" }; next } d == "" { next } /^name = / && p == 0 { print d "/" $2 ".rs" } /^path = / { p = 1; print $2 }' "$crate/Cargo.toml" \
|
||||||
|
|||||||
Reference in new issue
Block a user