From 20b248ceaf94862bfade8e4ec736189bad1c1e1b Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 12 Jun 2023 18:37:17 +0000 Subject: [PATCH] Fix build on supported platforms due to `log` breakage The `log` crate decided to break support for rustc 1.48 (Debian bullseye) the day the next release of Debian comes out, obviously before anyone has had a chance to upgrade to the new Debian bookworm (at https://github.com/rust-lang/log/pull/543). Thus, we have to manually pin it back to the previous release. Sadly, the `log` crate is a transitive dependency of `tokio` until 0.20, which requires rustc 1.49. Luckily at least we won't have to deal with this again, as `log` won't be a dependency of ours anymore soon. --- ci/ci-tests.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh index f948cc0d63e..c8407a14699 100755 --- a/ci/ci-tests.sh +++ b/ci/ci-tests.sh @@ -5,8 +5,12 @@ RUSTC_MINOR_VERSION=$(rustc --version | awk '{ split($2,a,"."); print a[2] }') HOST_PLATFORM="$(rustc --version --verbose | grep "host:" | awk '{ print $2 }')" # Tokio MSRV on versions 1.17 through 1.26 is rustc 1.49. Above 1.26 MSRV is 1.56. -[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.0" --verbose -[[ "$RUSTC_MINOR_VERSION" -gt 48 && "$RUSTC_MINOR_VERSION" -lt 56 ]] && cargo update -p tokio --precise "1.26.0" --verbose +[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p tokio --precise "1.14.1" --verbose +[[ "$RUSTC_MINOR_VERSION" -gt 48 && "$RUSTC_MINOR_VERSION" -lt 56 ]] && cargo update -p tokio --precise "1.25.1" --verbose + +# Sadly the log crate is always a dependency of tokio until 1.20, and it has no reasonably MSRV guarantees +[ "$RUSTC_MINOR_VERSION" -lt 49 ] && cargo update -p log --precise "0.4.18" --verbose + [ "$LDK_COVERAGE_BUILD" != "" ] && export RUSTFLAGS="-C link-dead-code" export RUST_BACKTRACE=1