X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.travis.yml;h=8c1f2fd0f0da7fc8454987d56a7610b11dad37b6;hb=71d22f7e06b0553b4af24a0196ca834e415eddbd;hp=9c9257855cd33c6fefd13385a885a0eec0c4eee4;hpb=404081a7557e0b7b546213d4674014717f3fffc3;p=rust-lightning

diff --git a/.travis.yml b/.travis.yml
index 9c925785..8c1f2fd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,12 @@ language: rust
 rust:
   - stable
   - beta
-  - 1.22.0
+  # 1.30.0 is MSRV for rust-lightning in general:
+  - 1.30.0
+  # 1.34.2 is Debian stable
   - 1.34.2
+  # 1.39.0 is MSRV for lightning-net-tokio and generates coverage
+  - 1.39.0
 cache: cargo
 
 before_install:
@@ -11,18 +15,24 @@ before_install:
   - sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev
 
 script:
-     # Build workspaces with Rust stable, beta, and 1.34.0
-     - if [ "$(rustup show | grep default | grep 1.22.0)" == "" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose; fi
-     # Build lightning workspace with Rust 1.22.0
-     - if [ "$(rustup show | grep default | grep 1.22.0)" != "" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose -p lightning; fi
+     # Support lightning-net-tokio only on Rust stable, beta, and 1.39.0
+     - if [ "$(rustup show | grep default | grep '1.39.0')" != "" ]; then export BUILD_NET_TOKIO=1; fi
+     - if [ "$(rustup show | grep default | grep '1\.')" == "" ]; then export BUILD_NET_TOKIO=1; fi
+     # Build the appropriate workspace(s)
+     - if [ "$BUILD_NET_TOKIO" == "1" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose; fi
+     - if [ "$BUILD_NET_TOKIO" != "1" ]; then RUSTFLAGS="-C link-dead-code" cargo build --verbose -p lightning; fi
      - rm -f target/debug/lightning-* # Make sure we drop old test binaries
-     # Test workspaces for Rust stable, beta, and 1.34.2
-     - if [ "$(rustup show | grep default | grep 1.22.0)" == "" ]; then RUSTFLAGS="-C link-dead-code" cargo test --verbose; fi
-     # Test lightning workspace for 1.22.0
-     - if [ "$(rustup show | grep default | grep 1.22.0)" != "" ]; then RUSTFLAGS="-C link-dead-code" cargo test --verbose -p lightning; fi
-     # Run lightning workspace fuzz tests for Rust 1.34.2
-     - if [ "$(rustup show | grep default | grep 1.34.2)" != "" ]; then cd lightning/fuzz && cargo test --verbose && ./travis-fuzz.sh; fi
-     - if [ "$(rustup show | grep default | grep stable)" != "" ]; then
+     # Run clippy on Rust 1.39.0
+     - if [ "$(rustup show | grep default | grep 1.39.0)" != "" ]; then
+           rustup component add clippy &&
+           cargo clippy -- -Aclippy::erasing_op -Aclippy::never_loop -Aclippy::if_same_then_else; fi
+     # Test the appropriate workspace(s)
+     - if [ "$BUILD_NET_TOKIO" == "1" ]; then RUSTFLAGS="-C link-dead-code" cargo test --verbose; fi
+     - if [ "$BUILD_NET_TOKIO" != "1" ]; then RUSTFLAGS="-C link-dead-code" cargo test --verbose -p lightning; fi
+     # Run lightning workspace fuzz tests on Rust stable
+     - if [ "$(rustup show | grep default | grep stable)" != "" ]; then cd fuzz && cargo test --verbose && ./ci-fuzz.sh; fi
+     # Generate code cov information on Rust 1.39.0
+     - if [ "$(rustup show | grep default | grep 1.39.0)" != "" ]; then
            wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
            tar xzf master.tar.gz &&
            cd kcov-master &&