From b8e7d3e3f34fd4659cab15f5dfe293006f575068 Mon Sep 17 00:00:00 2001 From: "Niko Dunixi [He/Him]" <1402178+niko-dunixi@users.noreply.github.com> Date: Thu, 18 Aug 2022 11:58:05 -0500 Subject: [PATCH 1/2] Updating tested rust version and pinning cargo dependencies --- crates/target_rust/docker/Cargo.toml | 6 +++--- crates/target_rust/docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/target_rust/docker/Cargo.toml b/crates/target_rust/docker/Cargo.toml index fec6e407..e74b0fe1 100644 --- a/crates/target_rust/docker/Cargo.toml +++ b/crates/target_rust/docker/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Ulysse Carion "] edition = "2018" [dependencies] -chrono = { version = "0.4", features = ["serde"] } -serde_json = "1" -serde = { version = "1.0", features = ["derive"] } +chrono = { version = "0.4.22", features = ["serde"] } +serde_json = "1.0.83" +serde = { version = "1.0.143", features = ["derive"] } diff --git a/crates/target_rust/docker/Dockerfile b/crates/target_rust/docker/Dockerfile index 2e6bf9fb..5f3c49f1 100644 --- a/crates/target_rust/docker/Dockerfile +++ b/crates/target_rust/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.49 +FROM rust:1.63 ARG MAIN From cfb134a9240daca0a577cf839d050f40d557ae24 Mon Sep 17 00:00:00 2001 From: "Niko Dunixi [He/Him]" <1402178+niko-dunixi@users.noreply.github.com> Date: Thu, 18 Aug 2022 11:38:39 -0500 Subject: [PATCH 2/2] Adding docker buildkit for test dependency caching --- crates/target_rust/docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/target_rust/docker/Dockerfile b/crates/target_rust/docker/Dockerfile index 5f3c49f1..09f27e2d 100644 --- a/crates/target_rust/docker/Dockerfile +++ b/crates/target_rust/docker/Dockerfile @@ -1,3 +1,4 @@ +# syntax=docker/dockerfile:1 FROM rust:1.63 ARG MAIN @@ -13,5 +14,5 @@ COPY /main.rs /work/src/main.rs COPY /gen /work/src/jtd_codegen_e2e/ RUN sed -i -e "s/MAIN/$MAIN/g" /work/src/main.rs -RUN cargo build +RUN --mount=type=cache,target="${HOME}/.cargo" cargo build ENTRYPOINT target/debug/jtd_e2e_test