Skip to content

Commit 49aaf77

Browse files
committed
fix(ci): include all workspace members in Earthfile
- Add terraphim_firecracker and terraphim_ai_nodejs to all COPY commands - Remove sed commands that excluded firecracker from builds - Keep full workspace for all targets (build, lint, test) Terraphim AI
1 parent 9615336 commit 49aaf77

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

Earthfile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ build-native:
136136
build-debug-native:
137137
FROM +source-native
138138
WORKDIR /code
139-
# Remove firecracker from workspace before building
140-
RUN rm -rf terraphim_firecracker || true
141-
RUN sed -i '/terraphim_firecracker/d' Cargo.toml
142-
# Also update default-members to match the remaining members
143-
RUN sed -i 's/default-members = \["terraphim_server"\]/default-members = ["terraphim_server"]/' Cargo.toml
144139
# Optimize build with parallel jobs and optimized settings
145140
RUN CARGO_BUILD_JOBS=$(nproc) CARGO_NET_RETRY=10 CARGO_NET_TIMEOUT=60 cargo build
146141
SAVE ARTIFACT /code/target/debug/terraphim_server AS LOCAL artifact/bin/terraphim_server_debug
@@ -159,7 +154,7 @@ source:
159154
WORKDIR /code
160155
CACHE --sharing shared --persist /code/vendor
161156
COPY --keep-ts Cargo.toml Cargo.lock ./
162-
COPY --keep-ts --dir terraphim_server desktop default crates ./
157+
COPY --keep-ts --dir terraphim_server terraphim_firecracker terraphim_ai_nodejs desktop default crates ./
163158
COPY --keep-ts desktop+build/dist /code/terraphim_server/dist
164159
RUN mkdir -p .cargo
165160
RUN cargo vendor > .cargo/config.toml
@@ -235,11 +230,7 @@ fmt:
235230

236231
lint:
237232
FROM +workspace-debug
238-
# Exclude firecracker from workspace for linting
239-
RUN rm -rf terraphim_firecracker || true
240-
# Temporarily remove firecracker from workspace members list
241-
RUN sed -i '/terraphim_firecracker/d' Cargo.toml
242-
RUN cargo clippy --workspace --all-targets --all-features --exclude terraphim_firecracker
233+
RUN cargo clippy --workspace --all-targets --all-features
243234

244235
build-focal:
245236
FROM ubuntu:20.04
@@ -249,7 +240,7 @@ build-focal:
249240
RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true TZ=Etc/UTC apt-get install -yqq --no-install-recommends build-essential bison flex ca-certificates openssl libssl-dev bc wget git curl cmake pkg-config
250241
WORKDIR /code
251242
COPY --keep-ts Cargo.toml Cargo.lock ./
252-
COPY --keep-ts --dir terraphim_server desktop default crates ./
243+
COPY --keep-ts --dir terraphim_server terraphim_firecracker terraphim_ai_nodejs desktop default crates ./
253244
COPY --keep-ts desktop+build/dist /code/terraphim-server/dist
254245
RUN curl https://pkgx.sh | sh
255246
RUN pkgx +openssl cargo build --release
@@ -266,7 +257,7 @@ build-jammy:
266257
# RUN rustup toolchain install stable
267258
WORKDIR /code
268259
COPY --keep-ts Cargo.toml Cargo.lock ./
269-
COPY --keep-ts --dir terraphim_server desktop default crates ./
260+
COPY --keep-ts --dir terraphim_server terraphim_firecracker terraphim_ai_nodejs desktop default crates ./
270261
IF [ "$CARGO_HOME" = "" ]
271262
ENV CARGO_HOME="$HOME/.cargo"
272263
END
@@ -328,7 +319,7 @@ docker-aarch64:
328319

329320
WORKDIR /code
330321
COPY --keep-ts Cargo.toml Cargo.lock ./
331-
COPY --keep-ts --dir terraphim_server desktop default crates ./
322+
COPY --keep-ts --dir terraphim_server terraphim_firecracker terraphim_ai_nodejs desktop default crates ./
332323

333324
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
334325
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \

0 commit comments

Comments
 (0)