X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ci%2Fci-tests.sh;h=ef9ecf7b86d8653d5bdf1b7ab758032425bd33d6;hb=2cb25576697f368f1807d6a1f2db3d6086beb84b;hp=89e3a32190548ea9976bf8a30e1b1483c4d1a45f;hpb=f6e0ad2a05a735a5fc5f8f78fc09196519ba2309;p=rust-lightning

diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh
index 89e3a321..ef9ecf7b 100755
--- a/ci/ci-tests.sh
+++ b/ci/ci-tests.sh
@@ -37,16 +37,45 @@ PIN_RELEASE_DEPS # pin the release dependencies in our main workspace
 export RUST_BACKTRACE=1
 
 echo -e "\n\nBuilding and testing all workspace crates..."
-cargo build --verbose --color always
 cargo test --verbose --color always
+cargo build --verbose --color always
 
-echo -e "\n\nBuilding with all Log-Limiting features"
-pushd lightning
-grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
-	cargo build --verbose --color always --features "$FEATURE"
-done
+echo -e "\n\nBuilding and testing Block Sync Clients with features"
+pushd lightning-block-sync
+cargo test --verbose --color always --features rest-client
+cargo build --verbose --color always --features rest-client
+cargo test --verbose --color always --features rpc-client
+cargo build --verbose --color always --features rpc-client
+cargo test --verbose --color always --features rpc-client,rest-client
+cargo build --verbose --color always --features rpc-client,rest-client
+cargo test --verbose --color always --features rpc-client,rest-client,tokio
+cargo build --verbose --color always --features rpc-client,rest-client,tokio
 popd
 
+if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
+	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
+	pushd lightning-transaction-sync
+	cargo test --verbose --color always --features esplora-blocking
+	cargo build --verbose --color always --features esplora-blocking
+	cargo test --verbose --color always --features esplora-async
+	cargo build --verbose --color always --features esplora-async
+	cargo test --verbose --color always --features esplora-async-https
+	cargo build --verbose --color always --features esplora-async-https
+	popd
+fi
+
+echo -e "\n\nTest futures builds"
+pushd lightning-background-processor
+cargo test --verbose --color always --features futures
+popd
+
+if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
+	echo -e "\n\nTest Custom Message Macros"
+	pushd lightning-custom-message
+	cargo test --verbose --color always
+	popd
+fi
+
 if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to change
 	echo -e "\n\nTest backtrace-debug builds"
 	pushd lightning
@@ -54,6 +83,13 @@ if [ "$RUSTC_MINOR_VERSION" -gt 51 ]; then # Current `object` MSRV, subject to c
 	popd
 fi
 
+echo -e "\n\nBuilding with all Log-Limiting features"
+pushd lightning
+grep '^max_level_' Cargo.toml | awk '{ print $1 }'| while read -r FEATURE; do
+	cargo build --verbose --color always --features "$FEATURE"
+done
+popd
+
 echo -e "\n\nTesting no-std flags in various combinations"
 for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do
 	pushd $DIR
@@ -77,7 +113,12 @@ popd
 echo -e "\n\nTesting no-std build on a downstream no-std crate"
 # check no-std compatibility across dependencies
 pushd no-std-check
-cargo check --verbose --color always --features lightning-transaction-sync
+if [[ $RUSTC_MINOR_VERSION -gt 67 ]]; then
+	# lightning-transaction-sync's MSRV is 1.67
+	cargo check --verbose --color always --features lightning-transaction-sync
+else
+	cargo check --verbose --color always
+fi
 popd
 
 # Test that we can build downstream code with only the "release pins".
@@ -92,42 +133,6 @@ if [ -f "$(which arm-none-eabi-gcc)" ]; then
 	popd
 fi
 
-echo -e "\n\nBuilding and testing Block Sync Clients with features"
-pushd lightning-block-sync
-cargo build --verbose --color always --features rest-client
-cargo test --verbose --color always --features rest-client
-cargo build --verbose --color always --features rpc-client
-cargo test --verbose --color always --features rpc-client
-cargo build --verbose --color always --features rpc-client,rest-client
-cargo test --verbose --color always --features rpc-client,rest-client
-cargo build --verbose --color always --features rpc-client,rest-client,tokio
-cargo test --verbose --color always --features rpc-client,rest-client,tokio
-popd
-
-if [[ $RUSTC_MINOR_VERSION -gt 67 && "$HOST_PLATFORM" != *windows* ]]; then
-	echo -e "\n\nBuilding and testing Transaction Sync Clients with features"
-	pushd lightning-transaction-sync
-	cargo build --verbose --color always --features esplora-blocking
-	cargo test --verbose --color always --features esplora-blocking
-	cargo build --verbose --color always --features esplora-async
-	cargo test --verbose --color always --features esplora-async
-	cargo build --verbose --color always --features esplora-async-https
-	cargo test --verbose --color always --features esplora-async-https
-	popd
-fi
-
-echo -e "\n\nTest futures builds"
-pushd lightning-background-processor
-cargo test --verbose --color always --features futures
-popd
-
-if [ "$RUSTC_MINOR_VERSION" -gt 55 ]; then
-	echo -e "\n\nTest Custom Message Macros"
-	pushd lightning-custom-message
-	cargo test --verbose --color always
-	popd
-fi
-
 echo -e "\n\nTest Taproot builds"
 pushd lightning
 RUSTFLAGS="$RUSTFLAGS --cfg=taproot" cargo test --verbose --color always -p lightning