build all branches with travis-ci

diff --git a/.travis.yml b/.travis.yml
index 3cb7d1cc5c1f0668d0023fddcd226c3a8a34dca1..4b301cc7dfe1675c4954e51418982030fa6a85fc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ env:
         - secure: "CoI8hwHH1yfQoQxIfWGRS0WfTyScox+5aJn0fDDgz2uKrrIxmBvIw/WKX8wcSiV6fLmLuwgNkKqSM3hdO4qaG+JxfWcuEiZZHm+kxSGMkWbGb/fvAI+gHg8ldKyYttcIX71O5rlZiC2QpNKQi2v18S6pI5p8eqnx7DYx4YrmguQ="
 compiler:
     - gcc
-branches:
-    only:
-        - master
 before_install:
     - sudo apt-get install libcap2-bin
 install:

diff --git a/ci/deploy-bintray.sh b/ci/deploy-bintray.sh
index 1dfef481eb7582eb17702f2fafde3cdcfdfe45d3..2c34a083ee1853ee7f67b0e7c14a801588ae4056 100755 (executable)
--- a/ci/deploy-bintray.sh
+++ b/ci/deploy-bintray.sh
@@ -10,6 +10,12 @@ if [ "$CC" != "gcc" ]; then
     exit 0
 fi
 
+# do this only for the master branch
+if [ "$TRAVIS_BRANCH" != "master" ]; then
+    echo "skipped upload branch $TRAVIS_BRANCH isn't master"
+    exit 0
+fi
+
 VERSION=$(ls fping-*.tar.gz | sed -e 's/^fping-//' | sed -e 's/\.tar\.gz$//')
 if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then
     REPO=release