feat: Bump

This commit is contained in:
sinavir 2024-12-27 00:34:38 +01:00
parent bb63c0218a
commit a9d9539f39
No known key found for this signature in database
4 changed files with 1002 additions and 669 deletions

1619
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -4,21 +4,21 @@ version = "0.3.0"
edition = "2021"
[dependencies]
serde = "1.0.210"
tokio = { version = "1.40.0", features = ["full"] }
tokio-stream = "0.1.16"
tonic = "0.12.2"
tower = "0.5.1"
tower-http = { version= "0.6.0", features = ["trace"]}
tracing = "0.1.40"
tvix-castore = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "3389c550b92d8b631f75e5a77e244fe698e4b4b2" }
tvix-store = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "3389c550b92d8b631f75e5a77e244fe698e4b4b2", features = ["xp-store-composition" ] }
tvix-tracing = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "3389c550b92d8b631f75e5a77e244fe698e4b4b2" }
nar-bridge = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "3389c550b92d8b631f75e5a77e244fe698e4b4b2" }
url = "2.5.2"
clap = "4.5.18"
axum = "0.7.6"
serde = "1.0.216"
tokio = { version = "1.42.0", features = ["full"] }
tokio-stream = "0.1.17"
tonic = "0.12.3"
tower = "0.5.2"
tower-http = { version= "0.6.2", features = ["trace"]}
tracing = "0.1.41"
tvix-castore = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "f3fdb02e6b56ed164b476a202bac27b7f6eda6cc" }
tvix-store = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "f3fdb02e6b56ed164b476a202bac27b7f6eda6cc", features = [ "otlp" ] }
tvix-tracing = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "f3fdb02e6b56ed164b476a202bac27b7f6eda6cc" }
nar-bridge = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "f3fdb02e6b56ed164b476a202bac27b7f6eda6cc" }
url = "2.5.4"
clap = "4.5.23"
axum = "0.7.9"
tokio-listener = { version = "0.4.3", features = ["serde"] }
toml = "0.8.19"
futures = "0.3.30"
tonic-health = "0.12.2"
futures = "0.3.31"
tonic-health = "0.12.3"

View file

@ -8,9 +8,9 @@
"repo": "git-hooks.nix"
},
"branch": "master",
"revision": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"url": "https://github.com/cachix/git-hooks.nix/archive/4e743a6920eab45e8ba0fbe49dc459f1423a4b74.tar.gz",
"hash": "0fc69dsn5rhv2zb16c2bfgx84ja8cmn7d7j2mrw3n4m8y611x40g"
"revision": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
"url": "https://github.com/cachix/git-hooks.nix/archive/f0f0dc4920a903c3e08f5bdb9246bb572fcae498.tar.gz",
"hash": "0vqk7r64y3n6y9c89bm1vsy378mw0c4pfgi1smvib71wkgp4smms"
},
"nixpkgs": {
"type": "Git",
@ -20,9 +20,9 @@
"repo": "nixpkgs"
},
"branch": "nixos-unstable",
"revision": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"url": "https://github.com/NixOS/nixpkgs/archive/c04d5652cfa9742b1d519688f65d1bbccea9eb7e.tar.gz",
"hash": "0sgr1aka3fpihq2z6clkfbix1kly4bxlxgwy419z26lhc7zjnr9y"
"revision": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"url": "https://github.com/NixOS/nixpkgs/archive/d70bd19e0a38ad4790d3913bf08fcbfc9eeca507.tar.gz",
"hash": "1968wcqnb5gb947js0kv17hy15nc5817ra66nj33nc532d342ig0"
}
},
"version": 3

View file

@ -1,4 +1,5 @@
mod config;
use std::num::NonZeroUsize;
use std::future::Future;
use std::pin::Pin;
@ -16,7 +17,9 @@ use tvix_castore::directoryservice::DirectoryService;
use tvix_castore::proto::blob_service_server::BlobServiceServer;
use tvix_castore::proto::directory_service_server::DirectoryServiceServer;
use tvix_castore::proto::{GRPCBlobServiceWrapper, GRPCDirectoryServiceWrapper};
use tvix_store::composition::{with_registry, Composition, REG};
use tvix_store::composition::REG;
use tvix_castore::composition::{with_registry, Composition};
use tvix_store::nar::{NarCalculationService, SimpleRenderer};
use tvix_store::pathinfoservice::PathInfoService;
use tvix_store::proto::path_info_service_server::PathInfoServiceServer;
@ -52,7 +55,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
info!("Starting multitenant-tvix-cache...");
let mut comp = Composition::default();
let mut comp = Composition::new(&REG);
comp.extend(configs.blobservices);
comp.extend(configs.directoryservices);
@ -79,6 +82,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
comp.build(v.blob_service.as_ref()).await?,
comp.build(v.directory_service.as_ref()).await?,
comp.build(v.path_info_service.as_ref()).await?,
NonZeroUsize::new(1000).unwrap(),
));
// TODO: Tracing ?