Skip to content

Commit

Permalink
chore: drop bors
Browse files Browse the repository at this point in the history
bors is not stable. We'll run the integration test after PR merged to develop
and RC branches.
  • Loading branch information
doitian committed Apr 12, 2019
1 parent eb7045c commit 09fcdd9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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:
Expand Down
9 changes: 6 additions & 3 deletions devtools/ci/script.sh
@@ -1,8 +1,6 @@
#!/bin/bash
set -ev

echo "TRAVIS_BRANCH=$TRAVIS_BRANCH"

cargo sweep -s

if [ "$FMT" = true ]; then
Expand All @@ -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
Expand Down

0 comments on commit 09fcdd9

Please sign in to comment.