Merge branch 'dht-testing' into 'main'

simplify earthfile

See merge request veilid/veilid!33
This commit is contained in:
John Smith 2023-06-21 06:08:41 +00:00
commit 7ae074365f

View File

@ -86,36 +86,36 @@ clippy:
# Build # Build
build-linux-amd64: build-linux-amd64:
FROM +code-linux FROM +code-linux
RUN cargo build --target x86_64-unknown-linux-gnu --release RUN cargo build --target x86_64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core
SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu AS LOCAL ./target/artifacts/x86_64-unknown-linux-gnu SAVE ARTIFACT ./target/x86_64-unknown-linux-gnu AS LOCAL ./target/artifacts/x86_64-unknown-linux-gnu
build-linux-arm64: build-linux-arm64:
FROM +code-linux FROM +code-linux
RUN cargo build --target aarch64-unknown-linux-gnu --release RUN cargo build --target aarch64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core
SAVE ARTIFACT ./target/aarch64-unknown-linux-gnu AS LOCAL ./target/artifacts/aarch64-unknown-linux-gnu SAVE ARTIFACT ./target/aarch64-unknown-linux-gnu AS LOCAL ./target/artifacts/aarch64-unknown-linux-gnu
build-android: # build-android:
FROM +code-android # FROM +code-android
WORKDIR /veilid/veilid-core # WORKDIR /veilid/veilid-core
ENV PATH=$PATH:/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/ # ENV PATH=$PATH:/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/bin/
RUN cargo build --target aarch64-linux-android --release # RUN cargo build --target aarch64-linux-android --release
RUN cargo build --target armv7-linux-androideabi --release # RUN cargo build --target armv7-linux-androideabi --release
RUN cargo build --target i686-linux-android --release # RUN cargo build --target i686-linux-android --release
RUN cargo build --target x86_64-linux-android --release # RUN cargo build --target x86_64-linux-android --release
WORKDIR /veilid # WORKDIR /veilid
SAVE ARTIFACT ./target/aarch64-linux-android AS LOCAL ./target/artifacts/aarch64-linux-android # SAVE ARTIFACT ./target/aarch64-linux-android AS LOCAL ./target/artifacts/aarch64-linux-android
SAVE ARTIFACT ./target/armv7-linux-androideabi AS LOCAL ./target/artifacts/armv7-linux-androideabi # SAVE ARTIFACT ./target/armv7-linux-androideabi AS LOCAL ./target/artifacts/armv7-linux-androideabi
SAVE ARTIFACT ./target/i686-linux-android AS LOCAL ./target/artifacts/i686-linux-android # SAVE ARTIFACT ./target/i686-linux-android AS LOCAL ./target/artifacts/i686-linux-android
SAVE ARTIFACT ./target/x86_64-linux-android AS LOCAL ./target/artifacts/x86_64-linux-android # SAVE ARTIFACT ./target/x86_64-linux-android AS LOCAL ./target/artifacts/x86_64-linux-android
# Unit tests # Unit tests
unit-tests-linux-amd64: unit-tests-linux-amd64:
FROM +code-linux FROM +code-linux
RUN cargo test --target x86_64-unknown-linux-gnu --release RUN cargo test --target x86_64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core
unit-tests-linux-arm64: unit-tests-linux-arm64:
FROM +code-linux FROM +code-linux
RUN cargo test --target aarch64-unknown-linux-gnu --release RUN cargo test --target aarch64-unknown-linux-gnu --release -p veilid-server -p veilid-cli -p veilid-tools -p veilid-core
# Package # Package
package-linux-amd64: package-linux-amd64: