From 70c74349683d1e927e8129a48ce39b6ac072d2cd Mon Sep 17 00:00:00 2001 From: nicholaslyang Date: Fri, 7 Jun 2024 15:44:45 -0400 Subject: [PATCH] More deps --- Cargo.lock | 40 +++++++++++++++++++++++++++-- Cargo.toml | 18 +++++++++---- crates/turborepo-updater/Cargo.toml | 4 +-- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0476fcba577d90..344702bda74740 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1499,6 +1499,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + [[package]] name = "combine" version = "4.6.6" @@ -3519,7 +3529,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.5.4", "tokio", "tower-service", "tracing", @@ -3944,6 +3954,8 @@ dependencies = [ "mime", "once_cell", "polling", + "serde", + "serde_json", "slab", "sluice", "tracing", @@ -4763,6 +4775,26 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mockito" +version = "0.32.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406f43768da5a859ce19bb0978fd8dc2167a7d9a52f3935c6a187242e1a4ff9f" +dependencies = [ + "assert-json-diff", + "colored", + "futures", + "hyper 0.14.28", + "lazy_static", + "log", + "rand 0.8.5", + "regex", + "serde_json", + "serde_urlencoded", + "similar", + "tokio", +] + [[package]] name = "modularize_imports" version = "0.68.14" @@ -10105,7 +10137,7 @@ dependencies = [ [[package]] name = "turbo" -version = "2.0.4-canary.2" +version = "2.0.4-canary.3" dependencies = [ "anyhow", "assert_cmd", @@ -11722,7 +11754,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" name = "update-informer" version = "1.1.0" dependencies = [ + "colored", "directories", + "isahc", + "mockito", + "once_cell", "reqwest", "semver 1.0.23", "serde", diff --git a/Cargo.toml b/Cargo.toml index ea883d902e5c98..61b1206e8a8f91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,14 +104,22 @@ unix-archive = ".tar.gz" pr-run-mode = "plan" [workspace.metadata.dist.dependencies.homebrew] -protobuf = { version = "*", targets = ["aarch64-apple-darwin", "x86_64-apple-darwin"] } +protobuf = "*" +capnp = "*" [workspace.metadata.dist.dependencies.chocolatey] -protoc = { version = "*", targets = ["x86_64-pc-windows-msvc"] } +protoc = "27.1.0" +capnproto = "*" [workspace.metadata.dist.dependencies.apt] -protobuf-compiler = { version = "*", targets = ["aarch64-unknown-linux-musl"] } -aarch64-linux-musl-gcc = { version = "*", targets = ["aarch64-unknown-linux-musl"] } +build-essential = "*" +musl-tools = "*" +clang = "*" +llvm = "*" +capnproto = "*" +gcc-aarch64-linux-gnu = { version = "*", targets = ["aarch64-unknown-linux-musl"] } +binutils-aarch64-linux-gnu = { version = "*", targets = ["aarch64-unknown-linux-musl"] } +protobuf-compiler = "*" [workspace.lints.clippy] too_many_arguments = "allow" @@ -232,7 +240,7 @@ wax = { path = "crates/turborepo-wax" } turborepo-vercel-api = { path = "crates/turborepo-vercel-api" } turborepo-vercel-api-mock = { path = "crates/turborepo-vercel-api-mock" } turborepo-vt100 = { path = "crates/turborepo-vt100" } -update-informer = { path = "crates/update-informer" } +update-informer = { path = "crates/update-informer", default-features = false, features = ["reqwest"] } # Be careful when selecting tls backend, including change default tls backend. # If you changed, must verify with ALL build targets with next-swc to ensure diff --git a/crates/turborepo-updater/Cargo.toml b/crates/turborepo-updater/Cargo.toml index 8c316c5ed4400a..d957ad0b0792b7 100644 --- a/crates/turborepo-updater/Cargo.toml +++ b/crates/turborepo-updater/Cargo.toml @@ -22,6 +22,4 @@ reqwest = { workspace = true, features = ["json", "blocking"] } semver = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } -update-informer = { workspace = true, default-features = false, features = [ - "reqwest", -] } +update-informer = { workspace = true }