diff options
| -rw-r--r-- | tvix/Cargo.lock | 4 | ||||
| -rw-r--r-- | tvix/Cargo.nix | 4 | ||||
| -rw-r--r-- | tvix/build/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/build/src/bin/tvix-build.rs | 17 | ||||
| -rw-r--r-- | tvix/castore/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/store/Cargo.toml | 2 | ||||
| -rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 17 |
7 files changed, 31 insertions, 17 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 7bf6594759dd..397778e6ce5f 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -4521,9 +4521,9 @@ dependencies = [ [[package]] name = "tonic-reflection" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b742c83ad673e9ab5b4ce0981f7b9e8932be9d60e8682cbf9120494764dbc173" +checksum = "7b56b874eedb04f89907573b408eab1e87c1c1dce43aac6ad63742f57faa99ff" dependencies = [ "prost 0.13.1", "prost-types 0.13.1", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 274d3d1d1ae3..c9fec85e2e37 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -14692,9 +14692,9 @@ rec { }; "tonic-reflection" = rec { crateName = "tonic-reflection"; - version = "0.12.1"; + version = "0.12.2"; edition = "2021"; - sha256 = "0wy1vdj4fj90j6zjqs78c2fvwcl9krxiz6709idspsbksqxchhmp"; + sha256 = "1zwrm9zzahipsrmaqfp4vk0w31qymf740fsp0yczh16vxrsbhmkv"; libName = "tonic_reflection"; authors = [ "James Nugent <james@jen20.com>" diff --git a/tvix/build/Cargo.toml b/tvix/build/Cargo.toml index 8bb68783f0ea..6a10b41e2eaf 100644 --- a/tvix/build/Cargo.toml +++ b/tvix/build/Cargo.toml @@ -20,7 +20,7 @@ mimalloc = "0.1.43" [dependencies.tonic-reflection] optional = true -version = "0.12.0" +version = "0.12.2" [build-dependencies] prost-build = "0.13.1" diff --git a/tvix/build/src/bin/tvix-build.rs b/tvix/build/src/bin/tvix-build.rs index 93e85871caab..b840e031db80 100644 --- a/tvix/build/src/bin/tvix-build.rs +++ b/tvix/build/src/bin/tvix-build.rs @@ -90,11 +90,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> { #[cfg(feature = "tonic-reflection")] { - let reflection_svc = tonic_reflection::server::Builder::configure() - .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) - .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET) - .build()?; - router = router.add_service(reflection_svc); + router = router.add_service( + tonic_reflection::server::Builder::configure() + .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) + .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET) + .build_v1alpha()?, + ); + router = router.add_service( + tonic_reflection::server::Builder::configure() + .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) + .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET) + .build_v1()?, + ); } info!(listen_address=%listen_address, "listening"); diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index ded2292db750..e04a97cb0036 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -60,7 +60,7 @@ optional = true [dependencies.tonic-reflection] optional = true -version = "0.12.0" +version = "0.12.2" [dependencies.vhost] optional = true diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 0cbaa102f051..7df14ce89597 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -50,7 +50,7 @@ mimalloc = "0.1.43" [dependencies.tonic-reflection] optional = true -version = "0.12.0" +version = "0.12.2" [dependencies.bigtable_rs] optional = true diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index d9d5b1597bb7..6da239a8fee3 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -201,11 +201,18 @@ async fn run_cli(cli: Cli) -> Result<(), Box<dyn std::error::Error + Send + Sync #[cfg(feature = "tonic-reflection")] { - let reflection_svc = tonic_reflection::server::Builder::configure() - .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) - .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET) - .build()?; - router = router.add_service(reflection_svc); + router = router.add_service( + tonic_reflection::server::Builder::configure() + .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) + .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET) + .build_v1alpha()?, + ); + router = router.add_service( + tonic_reflection::server::Builder::configure() + .register_encoded_file_descriptor_set(CASTORE_FILE_DESCRIPTOR_SET) + .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET) + .build_v1()?, + ); } let listen_address = &listen_args.listen_address.unwrap_or_else(|| { |