From e4e85558928b2396ea8f64c45888f77547a73791 Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Thu, 14 Oct 2021 11:08:26 +0300 Subject: [PATCH] Enable the upkeep_7_62_0 and poll_7_68_0 features in CI whenever the curl_static feature is enabled. --- ci/run.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 555542276..5126a6f00 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -5,19 +5,20 @@ set -ex cargo test --target $TARGET --no-run # First test with no extra protocols enabled. cargo test --target $TARGET --no-run --features static-curl -# Then with all extra protocols enabled. -cargo test --target $TARGET --no-run --features static-curl,protocol-ftp +# Then with all extra protocols and features enabled. +cargo test --target $TARGET --no-run --features static-curl,protocol-ftp,upkeep_7_62_0,poll_7_68_0 if [ -z "$NO_RUN" ]; then cargo test --target $TARGET cargo test --target $TARGET --features static-curl - cargo test --target $TARGET --features static-curl,protocol-ftp + cargo test --target $TARGET --features static-curl,protocol-ftp,upkeep_7_62_0,poll_7_68_0 # Note that `-Clink-dead-code` is passed here to suppress `--gc-sections` to # help confirm that we're compiling everything necessary for curl itself. RUSTFLAGS=-Clink-dead-code \ cargo run --manifest-path systest/Cargo.toml --target $TARGET RUSTFLAGS=-Clink-dead-code \ - cargo run --manifest-path systest/Cargo.toml --target $TARGET --features curl-sys/static-curl,curl-sys/protocol-ftp + cargo run --manifest-path systest/Cargo.toml --target $TARGET --features \ + curl-sys/static-curl,curl-sys/protocol-ftp,curl-sys/upkeep_7_62_0,curl-sys/poll_7_68_0 cargo doc --no-deps --target $TARGET cargo doc --no-deps -p curl-sys --target $TARGET