Skip to content

Commit 0c8ae0c

Browse files
committed
Fix Earthly tasks doing duplicate jobs #829
1 parent fbcd012 commit 0c8ae0c

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Earthfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,13 @@ source:
4343
COPY browser+build/dist /code/browser/data-browser/dist
4444
DO rust+CARGO --args=fetch
4545

46-
cross-build:
46+
fmt:
4747
FROM +source
48-
ARG --required TARGET
49-
DO rust+SET_CACHE_MOUNTS_ENV
50-
WITH DOCKER
51-
RUN --mount=$EARTHLY_RUST_CARGO_HOME_CACHE --mount=$EARTHLY_RUST_TARGET_CACHE cross build --target $TARGET --release
52-
END
53-
DO rust+COPY_OUTPUT --output=".*" # Copies all files to ./target
54-
RUN ./target/$TARGET/release/atomic-server --version
55-
SAVE ARTIFACT ./target/$TARGET/release/atomic-server AS LOCAL artifact/bin/atomic-server-$TARGET
48+
DO rust+CARGO --args="fmt --check"
49+
50+
lint:
51+
FROM +source
52+
DO rust+CARGO --args="clippy --no-deps --all-features --all-targets"
5653

5754
build:
5855
FROM +source
@@ -61,16 +58,19 @@ build:
6158
SAVE ARTIFACT ./target/release/atomic-server AS LOCAL artifact/bin/atomic-server-x86_64-unknown-linux-gnu
6259

6360
test:
64-
FROM +source
61+
FROM +build
6562
DO rust+CARGO --args="test"
6663

67-
fmt:
68-
FROM +source
69-
DO rust+CARGO --args="fmt --check"
70-
71-
lint:
64+
cross-build:
7265
FROM +source
73-
DO rust+CARGO --args="clippy --no-deps --all-features --all-targets"
66+
ARG --required TARGET
67+
DO rust+SET_CACHE_MOUNTS_ENV
68+
WITH DOCKER
69+
RUN --mount=$EARTHLY_RUST_CARGO_HOME_CACHE --mount=$EARTHLY_RUST_TARGET_CACHE cross build --target $TARGET --release
70+
END
71+
DO rust+COPY_OUTPUT --output=".*" # Copies all files to ./target
72+
RUN ./target/$TARGET/release/atomic-server --version
73+
SAVE ARTIFACT ./target/$TARGET/release/atomic-server AS LOCAL artifact/bin/atomic-server-$TARGET
7474

7575
docker-musl:
7676
FROM alpine:3.18

0 commit comments

Comments
 (0)