From 00157eb8a96cff6766a7dd6f0547ded3a4e36b5e Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 10 Jan 2025 16:45:40 +0000 Subject: [PATCH] Detect the current version of rustls before pinning --- ci/ci-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh index b7e09246ae3..4855e3af1ef 100755 --- a/ci/ci-tests.sh +++ b/ci/ci-tests.sh @@ -21,8 +21,9 @@ function PIN_RELEASE_DEPS { # indexmap 2.6.0 upgraded to hashbrown 0.15, which unfortunately bumped their MSRV to rustc 1.65 with the 0.15.1 release (and 2.7.0 was released since). [ "$RUSTC_MINOR_VERSION" -lt 65 ] && cargo update -p indexmap@2.7.0 --precise "2.5.0" --verbose + CURRENT_RUSTLS="$(cargo tree --features=electrum | grep -o 'rustls v0.23.*' | sed 's/rustls v//')" # Starting with version 0.23.20, the `rustls` crate has an MSRV of rustc 1.71.0 - [ "$RUSTC_MINOR_VERSION" -lt 71 ] && cargo update -p rustls@0.23.20 --precise "0.23.19" --verbose + [ "$RUSTC_MINOR_VERSION" -lt 71 ] && cargo update -p rustls@"$CURRENT_RUSTLS" --precise "0.23.19" --verbose return 0 # Don't fail the script if our rustc is higher than the last check }