Skip to content

Commit b0d17f9

Browse files
author
Test User
committed
fix(ci): correct zig PATH and remove infrastructure from workspace
Fixes two issues discovered in v1.20.2 release workflow: 1. Cross.toml: zig was extracted to /usr/local/ but not in PATH. Now extracts to /opt/zig/ and symlinks to /usr/local/bin/zig. 2. Cargo.toml: Removed infrastructure/* from workspace.members since it contains no actual Rust crates, causing Docker build failures. 3. Dockerfile: Reverted infrastructure mkdir (no longer needed). Refs #1874
1 parent 0d7e752 commit b0d17f9

3 files changed

Lines changed: 9 additions & 11 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[workspace]
33
resolver = "2"
4-
members = ["crates/*", "crates/terraphim_grep", "crates/terraphim_merge_coordinator", "terraphim_server", "terraphim_firecracker", "terraphim_ai_nodejs", "infrastructure/*"]
4+
members = ["crates/*", "crates/terraphim_grep", "crates/terraphim_merge_coordinator", "terraphim_server", "terraphim_firecracker", "terraphim_ai_nodejs"]
55
# Note: terraphim_usage and terraphim_ccusage are new crates in crates/*
66
exclude = [
77
# Experimental crates"

Cross.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,28 @@
22
# See: https://github.com/cross-rs/cross/wiki/Configuration
33

44
# Install zig in cross-compilation containers for zlob dependency
5+
# The zig tarball extracts to zig-linux-x86_64-VERSION/ containing 'zig' binary and 'lib/' directory
6+
# We extract to /opt/zig and symlink the binary to /usr/local/bin/zig which is in PATH
57
[target.aarch64-unknown-linux-musl]
68
pre-build = [
79
"apt-get update && apt-get install -y curl tar xz-utils",
8-
"curl -L https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz -o /tmp/zig.tar.xz",
9-
"tar -xf /tmp/zig.tar.xz -C /usr/local --strip-components=1",
10+
"mkdir -p /opt/zig && curl -L https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz | tar -xJ -C /opt/zig --strip-components=1",
11+
"ln -sf /opt/zig/zig /usr/local/bin/zig",
1012
"zig version",
1113
]
1214

1315
[target.x86_64-unknown-linux-musl]
1416
pre-build = [
1517
"apt-get update && apt-get install -y curl tar xz-utils",
16-
"curl -L https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz -o /tmp/zig.tar.xz",
17-
"tar -xf /tmp/zig.tar.xz -C /usr/local --strip-components=1",
18+
"mkdir -p /opt/zig && curl -L https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz | tar -xJ -C /opt/zig --strip-components=1",
19+
"ln -sf /opt/zig/zig /usr/local/bin/zig",
1820
"zig version",
1921
]
2022

2123
[target.armv7-unknown-linux-musleabihf]
2224
pre-build = [
2325
"apt-get update && apt-get install -y curl tar xz-utils",
24-
"curl -L https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz -o /tmp/zig.tar.xz",
25-
"tar -xf /tmp/zig.tar.xz -C /usr/local --strip-components=1",
26+
"mkdir -p /opt/zig && curl -L https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz | tar -xJ -C /opt/zig --strip-components=1",
27+
"ln -sf /opt/zig/zig /usr/local/bin/zig",
2628
"zig version",
2729
]

docker/Dockerfile.multiarch

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ COPY terraphim_server ./terraphim_server
109109
COPY terraphim_ai_nodejs ./terraphim_ai_nodejs
110110
COPY terraphim_firecracker/Cargo.toml terraphim_firecracker/
111111

112-
# Create infrastructure directory to satisfy workspace member glob
113-
# (infrastructure/* is in workspace.members but contains no actual crates)
114-
RUN mkdir -p infrastructure
115-
116112
# Replace any committed server assets with the CI-built frontend bundle.
117113
RUN rm -rf terraphim_server/dist && mkdir -p terraphim_server/dist
118114
COPY --from=frontend-builder /app/dist ./terraphim_server/dist

0 commit comments

Comments
 (0)