From 35eb38df14fde0ea62e19b855e0144c23783af71 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 23 Oct 2023 19:50:12 +0000 Subject: [PATCH] Fix CI on rustc 1.50 and below rustc doesn't allow `--features` with `-p`, so we simply skip the steps that rely on it. --- ci/ci-tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/ci-tests.sh b/ci/ci-tests.sh index 676e94b44..00fc54774 100755 --- a/ci/ci-tests.sh +++ b/ci/ci-tests.sh @@ -100,13 +100,13 @@ popd echo -e "\n\nTesting no-std flags in various combinations" for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do - cargo test -p $DIR --verbose --color always --no-default-features --features no-std + [ "$RUSTC_MINOR_VERSION" -gt 50 ] && cargo test -p $DIR --verbose --color always --no-default-features --features no-std # check if there is a conflict between no-std and the default std feature - cargo test -p $DIR --verbose --color always --features no-std + [ "$RUSTC_MINOR_VERSION" -gt 50 ] && cargo test -p $DIR --verbose --color always --features no-std done for DIR in lightning lightning-invoice lightning-rapid-gossip-sync; do # check if there is a conflict between no-std and the c_bindings cfg - RUSTFLAGS="--cfg=c_bindings" cargo test -p $DIR --verbose --color always --no-default-features --features=no-std + [ "$RUSTC_MINOR_VERSION" -gt 50 ] && RUSTFLAGS="--cfg=c_bindings" cargo test -p $DIR --verbose --color always --no-default-features --features=no-std done RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -- 2.39.5