From 171244a4719a3b6a497913c86473d2135ba466c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 28 Jul 2016 20:27:10 +0200 Subject: [PATCH] Splitting documentation into separate build job (#1752) * Splitting documentation into separate build job * Updating rust to stable [ci skip] --- .travis.yml | 9 ++++++--- Cargo.toml | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d856086f9..bede69962 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,11 @@ git: matrix: include: - rust: stable - env: FEATURES="--features travis-beta" RUN_TESTS="true" + env: RUN_TESTS="true" - rust: beta - env: FEATURES="--features travis-beta" RUN_COVERAGE="true" + env: RUN_COVERAGE="true" + - rust: stable + env: RUN_DOCS="true" env: global: @@ -27,6 +29,7 @@ env: - RUST_BACKTRACE="1" - RUN_TESTS="false" - RUN_COVERAGE="false" + - RUN_DOCS="false" # GH_TOKEN for documentation - secure: bumJASbZSU8bxJ0EyPUJmu16AiV9EXOpyOj86Jlq/Ty9CfwGqsSXt96uDyE+OUJf34RUFQMsw0nk37/zC4lcn6kqk2wpuH3N/o85Zo/cVZY/NusBWLQqtT5VbYWsV+u2Ua4Tmmsw8yVYQhYwU2ZOejNpflL+Cs9XGgORp1L+/gMRMC2y5Se6ZhwnKPQlRJ8LGsG1dzjQULxzADIt3/zuspNBS8a2urJwlHfGMkvHDoUWCviP/GXoSqw3TZR7FmKyxE19I8n9+iSvm9+oZZquvcgfUxMHn8Gq/b44UbPvjtFOg2yam4xdWXF/RyWCHdc/R9EHorSABeCbefIsm+zcUF3/YQxwpSxM4IZEeH2rTiC7dcrsKw3XsO16xFQz5YI5Bay+CT/wTdMmJd7DdYz7Dyf+pOvcM9WOf/zorxYWSBOMYy0uzbusU2iyIghQ82s7E/Ahg+WARtPgkuTLSB5aL1oCTBKHqQscMr7lo5Ti6RpWLxEdTQMBznc+bMr+6dEtkEcG9zqc6cE9XX+ox3wTU6+HVMfQ1ltCntJ4UKcw3A6INEbw9wgocQa812CIASQ2fE+SCAbz6JxBjIAlFUnD1lUB7S8PdMPwn9plfQgKQ2A5YZqg6FnBdf0rQXIJYxQWKHXj/rBHSUCT0tHACDlzTA+EwWggvkP5AGIxRxm8jhw= - KCOV_CMD="./kcov-master/tmp/usr/local/bin/kcov" @@ -67,7 +70,7 @@ script: after_success: | [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ] && - [ $TRAVIS_RUST_VERSION = stable ] && + [ "$RUN_DOCS" = "true" ] && ./scripts/doc.sh && pip install --user ghp-import && /home/travis/.local/bin/ghp-import -n target/doc && diff --git a/Cargo.toml b/Cargo.toml index 6623db741..bf35a1697 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,8 +57,6 @@ ui = ["dapps", "ethcore-signer/ui"] use-precompiled-js = ["ethcore-dapps/use-precompiled-js", "ethcore-signer/use-precompiled-js"] dapps = ["ethcore-dapps"] dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethcore-dapps/dev", "ethcore-signer/dev"] -travis-beta = ["ethcore/json-tests"] -travis-nightly = ["ethcore/json-tests", "dev"] ipc = ["ethcore/ipc"] [[bin]]