From 79259c5a05a5961b490d29bb185a1b73654687d4 Mon Sep 17 00:00:00 2001 From: Florian Dieminger Date: Thu, 19 Sep 2024 10:41:43 +0200 Subject: [PATCH] fix(ci): use rustls for self_update This was breaking our CI. --- Cargo.lock | 4 ++-- Cargo.toml | 15 +++++++++++---- crates/rari-deps/Cargo.toml | 15 +-------------- crates/rari-tools/Cargo.toml | 14 +------------- 4 files changed, 15 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e1aebea6..9dad686b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3994,9 +3994,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] diff --git a/Cargo.toml b/Cargo.toml index 3c4801af..c62ff576 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,9 +76,20 @@ regress = "0.10" html-escape = "0.2" ignore = "0.4" rayon = "1" +reqwest = { version = "0.12", default-features = false, features = [ + "blocking", + "json", + "rustls-tls", + "gzip", +] } [dependencies] +self_update = { version = "0.41", features = [ + "rustls", + "compression-flate2", + "compression-zip-deflate", +] } anyhow = "1" clap = { version = "4.5.1", features = ["derive"] } clap-verbosity-flag = "2" @@ -92,7 +103,3 @@ tracing = "0.1" tracing-subscriber = "0.3" tracing-log = "0.2" tabwriter = "1" -self_update = { version = "0.41", features = [ - "compression-flate2", - "compression-zip-deflate", -] } diff --git a/crates/rari-deps/Cargo.toml b/crates/rari-deps/Cargo.toml index 372c2601..a26e221f 100644 --- a/crates/rari-deps/Cargo.toml +++ b/crates/rari-deps/Cargo.toml @@ -12,21 +12,8 @@ serde.workspace = true serde_json.workspace = true chrono.workspace = true thiserror.workspace = true +reqwest.workspace = true css-syntax-types = { path = "../css-syntax-types" } tar = "0.4" flate2 = "1" - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -reqwest = { version = "0.12", default-features = false, features = [ - "blocking", - "json", - "rustls-tls", - "gzip", -] } - -[target.'cfg(target_arch = "wasm32")'.dependencies] -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "gzip", -] } diff --git a/crates/rari-tools/Cargo.toml b/crates/rari-tools/Cargo.toml index 757b8f72..a2e64b22 100644 --- a/crates/rari-tools/Cargo.toml +++ b/crates/rari-tools/Cargo.toml @@ -15,22 +15,10 @@ serde_json.workspace = true chrono.workspace = true tracing.workspace = true concat-in-place.workspace = true +reqwest.workspace = true csv = "1" -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -reqwest = { version = "0.12", default-features = false, features = [ - "blocking", - "json", - "rustls-tls", - "gzip", -] } - -[target.'cfg(target_arch = "wasm32")'.dependencies] -reqwest = { version = "0.12", default-features = false, features = [ - "json", - "gzip", -] } [dev-dependencies] rari-types = { workspace = true, features = ["testing"] }