feat: enable ci for 3.6.0 branch (#1580)

.travis.yml

@@ -34,6 +34,7 @@ branches:
  only:
  - master
  - next
+ - 3.6.0
 
 matrix:
  fast_finish: true

scripts/ci/browserstack/stop-tunnel.sh

@@ -5,12 +5,12 @@ set -e -o pipefail
 
 echo "Shutting down Browserstack tunnel"
 
-killall BrowserStackLocal
+pkill BrowserStack
 
 while [[ -n `ps -ef | grep "BrowserStackLocal" | grep -v "grep"` ]]; do
  printf "."
  sleep .5
 done
 
 echo ""
-echo "Browserstack tunnel has been shut down"
+echo "Browserstack tunnel has been shut down"

scripts/ci/travis-script.sh

@@ -30,7 +30,9 @@ CURRENT_BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRA
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
  fileDiff=$(git diff --name-only $TRAVIS_COMMIT_RANGE)
 else
- fileDiff=$(git diff --name-only $TRAVIS_BRANCH...HEAD)
+ git remote set-branches --add origin $TRAVIS_BRANCH
+ git fetch origin $TRAVIS_BRANCH
+ fileDiff=$(git diff --name-only HEAD origin/${TRAVIS_BRANCH})
 fi
 
 # Check if tests can be skipped