From: Elias Rohrer Date: Mon, 4 Nov 2024 17:10:20 +0000 (+0100) Subject: f Move pin to right place X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8a8e0f7c8a18334e367f49aab631d6f4c7044720;p=rust-lightning f Move pin to right place --- diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh index 59aa0b6f8..1ee6eff98 100755 --- a/ci/ci-tests.sh +++ b/ci/ci-tests.sh @@ -14,6 +14,10 @@ function PIN_RELEASE_DEPS { # Starting with version 0.7.12, the `tokio-util` crate has an MSRV of rustc 1.70.0 [ "$RUSTC_MINOR_VERSION" -lt 70 ] && cargo update -p tokio-util --precise "0.7.11" --verbose + # url 2.5.3 switched to idna 1.0.3 and ICU4X, which requires rustc 1.67 or newer. + # Here we opt to keep using unicode-rs by pinning idna_adapter as described here: https://docs.rs/crate/idna_adapter/1.2.0 + [ "$RUSTC_MINOR_VERSION" -lt 67 ] && cargo update -p idna_adapter --precise "1.1.0" --verbose + return 0 # Don't fail the script if our rustc is higher than the last check } @@ -73,10 +77,6 @@ cargo test -p lightning-block-sync --verbose --color always --features rpc-clien cargo check -p lightning-block-sync --verbose --color always --features rpc-client,rest-client,tokio if [[ "$HOST_PLATFORM" != *windows* ]]; then - # url 2.5.3 switched to idna 1.0.3 and ICU4X, which requires rustc 1.67 or newer. - # Here we opt to keep using unicode-rs by pinning idna_adapter as described here: https://docs.rs/crate/idna_adapter/1.2.0 - [ "$RUSTC_MINOR_VERSION" -lt 67 ] && cargo update -p idna_adapter --precise "1.1.0" --verbose - echo -e "\n\nChecking Transaction Sync Clients with features." cargo check -p lightning-transaction-sync --verbose --color always --features esplora-blocking cargo check -p lightning-transaction-sync --verbose --color always --features esplora-async