diff --git a/.travis.yml b/.travis.yml index a09d33dd32..0735ff1ec4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ git: depth: 2 submodules: false -if: 'branch IN (master, develop, staging, trying) OR type != push OR fork = true OR tag IS present' +if: 'branch = master OR type != push OR fork = true OR tag IS present' env: global: diff --git a/devtools/ci/script.sh b/devtools/ci/script.sh index 00a0e069df..5a3ee0c444 100755 --- a/devtools/ci/script.sh +++ b/devtools/ci/script.sh @@ -1,8 +1,6 @@ #!/bin/bash set -ev -echo "TRAVIS_BRANCH=$TRAVIS_BRANCH" - cargo sweep -s if [ "$FMT" = true ]; then @@ -18,15 +16,20 @@ fi git diff --exit-code Cargo.lock -if [ "$TRAVIS_BRANCH" = master -o "$TRAVIS_BRANCH" = staging -o "$TRAVIS_BRANCH" = trying ]; then +# We'll create PR for develop and rc branches to trigger the integration test. +if [ "$TRAVIS_BRANCH" = master ]; then + echo "Running integration test..." cargo build cd test && cargo run ../target/debug/ckb # Switch to release mode when the running time is much longer than the build time. # cargo build --release # cargo run --release -p ckb-test target/release/ckb +else + echo "Skip integration test..." fi +# Publish package for release if [ -n "$TRAVIS_TAG" -a -n "$GITHUB_TOKEN" -a -n "$REL_PKG" ]; then make build rm -rf releases