From ac1fb97b25cfe6205d757f5c0b0a3c2806a0d8c2 Mon Sep 17 00:00:00 2001
From: ian <ian@nervos.org>
Date: Fri, 12 Apr 2019 21:13:18 +0800
Subject: [PATCH] chore: drop bors

bors is not stable. We'll run the integration test after PR merged to develop
and RC branches.
---
 .travis.yml           | 2 +-
 devtools/ci/script.sh | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0db4e08f49..a80c701aa1 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 cc77ddc9d1..b592e49a5b 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,13 +16,18 @@ 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..."
   make integration
 
   # Switch to release mode when the running time is much longer than the build time.
   # make integration-release
+else
+  echo "Skip integration test..."
 fi
 
+# Publish package for release
 if [ -n "$TRAVIS_TAG" -a -n "$GITHUB_TOKEN" -a -n "$REL_PKG" ]; then
   git fetch --unshallow
   make build