From fdf96576545dec3fca5d52c159b7f96645d88c14 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 Mar 2024 22:58:46 +0200 Subject: fix(tvix): don't emit rerun-if-changed `build.rs` emits rerun-if-changed statements for all proto files, as well as all include paths we pass it. Unfortunately, due to protobufs include path rules, we need to specify the path to the depot root itself as an include path, at least when building impurely with `cargo`. This causes cargo to essentially always rebuild, as it also puts its own temporary files in there. Unfortunately, tonic-build does not chase down to individual .proto files that are included. Disable emitting these `rerun-if-changed` statements for now. This could cause cargo to not rebuild protos every time, causing stale data until the next local `cargo clean`, but considering the protos change not that frequently, and it'll immediately surface if trying to build via Nix (either locally or in CI), it's a good-enough compromise. Change-Id: Ifd279a2216222ef3fc0e70c5a2fe6f87997f562e Reviewed-on: https://cl.tvl.fyi/c/depot/+/11157 Autosubmit: flokli Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/build/build.rs | 4 ++-- tvix/castore/build.rs | 4 ++-- tvix/store/build.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tvix/build/build.rs b/tvix/build/build.rs index d75ebf714338..c3518ea8772b 100644 --- a/tvix/build/build.rs +++ b/tvix/build/build.rs @@ -20,6 +20,7 @@ fn main() -> Result<()> { builder .build_server(true) .build_client(true) + .emit_rerun_if_changed(false) .compile_with_config( config, &[ @@ -33,6 +34,5 @@ fn main() -> Result<()> { Some(proto_root) => proto_root.to_str().unwrap().to_owned(), None => "../..".to_string(), }], - )?; - Ok(()) + ) } diff --git a/tvix/castore/build.rs b/tvix/castore/build.rs index 339ba867dd21..6424487b2112 100644 --- a/tvix/castore/build.rs +++ b/tvix/castore/build.rs @@ -19,6 +19,7 @@ fn main() -> Result<()> { builder .build_server(true) .build_client(true) + .emit_rerun_if_changed(false) .compile_with_config( config, &[ @@ -33,6 +34,5 @@ fn main() -> Result<()> { Some(proto_root) => proto_root.to_str().unwrap().to_owned(), None => "../..".to_string(), }], - )?; - Ok(()) + ) } diff --git a/tvix/store/build.rs b/tvix/store/build.rs index cfeda59698a0..809fa29578b5 100644 --- a/tvix/store/build.rs +++ b/tvix/store/build.rs @@ -20,6 +20,7 @@ fn main() -> Result<()> { builder .build_server(true) .build_client(true) + .emit_rerun_if_changed(false) .compile_with_config( config, &[ @@ -33,6 +34,5 @@ fn main() -> Result<()> { Some(proto_root) => proto_root.to_str().unwrap().to_owned(), None => "../..".to_string(), }], - )?; - Ok(()) + ) } -- cgit 1.4.1