From f8501d72036431c8380ce2a3cc63b270807ac20f Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 1 Feb 2016 14:26:52 +0100 Subject: [PATCH 1/2] build docs for all ethcore libs --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21a77f684..42d3c881b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ matrix: fast_finish: true include: - rust: nightly + env: FEATURES="--features rpc" cache: apt: true directories: @@ -27,9 +28,9 @@ script: - cargo test --release -p ethash --verbose - cargo test --release -p ethcore-util --verbose - cargo test --release -p ethcore --verbose -- cargo test --release -p ethcore-rpc --verbose --features rpc -- cargo test --release --verbose -- cargo bench --no-run +- cargo test --release -p ethcore-rpc --verbose ${FEATURES} +- cargo test --release --verbose ${FEATURES} +- cargo bench --no-run ${FEATURES} after_success: | wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && cd ../.. && @@ -39,14 +40,14 @@ after_success: | ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* && cargo test --no-run -p ethcore --no-default-features && ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore-* && - cargo test --no-run -p ethcore-rpc --features rpc + cargo test --no-run -p ethcore-rpc ${FEATURES} ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_rpc-* && - cargo test --no-run && + cargo test --no-run ${FEATURES} && ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${COVERALLS_TOKEN} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_RUST_VERSION = nightly ] && - cargo doc --no-deps && + cargo doc ${FEATURES} --no-deps --verbose -p ethcore -p ethcore-util -p ethcore-rpc -p parity -p ethash -p ethsync && echo '' > target/doc/index.html && pip install --user ghp-import && /home/travis/.local/bin/ghp-import -n target/doc From 735af1e9d75774091561779cdbc7aecc98083f50 Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 1 Feb 2016 14:28:24 +0100 Subject: [PATCH 2/2] add missing && to .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42d3c881b..4adcdd4b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ after_success: | ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* && cargo test --no-run -p ethcore --no-default-features && ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore-* && - cargo test --no-run -p ethcore-rpc ${FEATURES} + cargo test --no-run -p ethcore-rpc ${FEATURES} && ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_rpc-* && cargo test --no-run ${FEATURES} && - ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${COVERALLS_TOKEN} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* + ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${COVERALLS_TOKEN} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* && [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_RUST_VERSION = nightly ] &&