From a1c2fa82c84cf99d9a5c9e815d6c6a0b2921c282 Mon Sep 17 00:00:00 2001 From: Tatsuya Kawano Date: Tue, 12 Dec 2023 01:03:15 +0000 Subject: [PATCH] Fix the CI for nightly + minimal crate versions and also for the MSRV - Change the following dev dependencies for nightly + minimal crate versions: - Switch back to native-tls in reqwest. - Change the following dev dependencies for the MSRV 1.60.0: - Pin async-global-executor version to v2.3.1. - Pin blocking version to v1.4.1. --- .ci_extras/pin-crate-vers-msrv.sh | 2 ++ .ci_extras/pin-crate-vers-nightly.sh | 2 ++ Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci_extras/pin-crate-vers-msrv.sh b/.ci_extras/pin-crate-vers-msrv.sh index e8744210..e41bc0eb 100755 --- a/.ci_extras/pin-crate-vers-msrv.sh +++ b/.ci_extras/pin-crate-vers-msrv.sh @@ -5,7 +5,9 @@ set -eux # Pin some dependencies to specific versions for the MSRV. cargo update -p tempfile --precise 3.6.0 cargo update -p tokio --precise 1.29.1 +cargo update -p async-global-executor --precise 2.3.1 cargo update -p async-executor --precise 1.5.1 +cargo update -p blocking --precise 1.4.1 cargo update -p reqwest --precise 0.11.18 cargo update -p regex --precise 1.9.6 cargo update -p memchr --precise 2.6.2 diff --git a/.ci_extras/pin-crate-vers-nightly.sh b/.ci_extras/pin-crate-vers-nightly.sh index 75473ecb..2db7cf21 100755 --- a/.ci_extras/pin-crate-vers-nightly.sh +++ b/.ci_extras/pin-crate-vers-nightly.sh @@ -3,4 +3,6 @@ set -eux # Pin some dependencies to specific versions for the nightly toolchain. +cargo update -p openssl --precise 0.10.39 +cargo update -p cc --precise 1.0.61 cargo update -p proc-macro2 --precise 1.0.60 diff --git a/Cargo.toml b/Cargo.toml index 068d052a..0af511e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ async-std = { version = "1.11", features = ["attributes"] } env_logger = "0.9" getrandom = "0.2" paste = "1.0.9" -reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls"] } +reqwest = "0.11.11" skeptic = "0.13" tokio = { version = "1.19", features = ["fs", "macros", "rt-multi-thread", "sync", "time" ] }