travis-ci improvements

diff --git a/.travis.yml b/.travis.yml
index 0370390a1c469c42a5983ad91865bba4fab18073..08ddccf9121af566ee23ad39c887866a8ecc7a81 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,17 +31,9 @@ addons:
     build_command:   "ci/build-3-compile.sh"
     branch_pattern: coverity_scan
     
-install:
-  - ci/build-2-test-command.sh
-  - ci/build-3-prepare-macos.sh
-
 script:
   - ci/build-4-compile.sh
   - ci/run-tests.sh
-  - ci/deploy-bintray.sh
-
-after_success:
-  - ci/deploy-coveralls.sh
 
 stages:
   - test
@@ -55,20 +47,25 @@ jobs:
       name: test trusty
       os: linux
       dist: trusty
-      before_install:
+      install:
         - ci/build-1-autotools.sh
 
     - name: test xenial
       os: linux
       dist: xenial
+      after_success:
+        - ci/deploy-coveralls.sh
 
     - name: test macos
       os: osx
+      install:
+        - ci/build-2-test-command.sh
+        - ci/build-3-prepare-macos.sh
 
     #### STAGE: deploy
     - stage: deploy
       name: deploy
       os: linux
       dist: xenial
-      env:
-        - DO_DEPLOY=1
+      after_success:
+        - ci/deploy-bintray.sh

diff --git a/ci/build-3-prepare-macos.sh b/ci/build-3-prepare-macos.sh
index 75ff33bd4d5e67efe8b22fea6f7bd5d0dbff5474..09125eb3dab02f5a44a79c0baae0ae8888c0cd67 100755 (executable)
--- a/ci/build-3-prepare-macos.sh
+++ b/ci/build-3-prepare-macos.sh
@@ -11,8 +11,3 @@ if [[ ! `ifconfig lo0` =~ 127\.0\.0\.2 ]]; then
     sudo ifconfig lo0 127.0.0.4/8 alias
     sudo ifconfig lo0 127.0.0.5/8 alias
 fi 
-
-if [[ ! $PATH =~ /Users/dws/checkouts/fping/src ]]; then
-    echo "# WARNING: must set PATH:"
-    echo PATH=/Users/dws/checkouts/fping/src:\$PATH
-fi

diff --git a/ci/deploy-bintray.sh b/ci/deploy-bintray.sh
index a234f2cdf233a284b2c8a4cdba098c3f2061399d..0dc88007659f2b1ff9c415d664bd2c790e03c08c 100755 (executable)
--- a/ci/deploy-bintray.sh
+++ b/ci/deploy-bintray.sh
@@ -4,11 +4,6 @@
 
 set -e
 
-if [ -z "$DO_DEPLOY" ]; then
-    echo "skip deploy (\$DO_DEPLOY not set)"
-    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

diff --git a/ci/deploy-coveralls.sh b/ci/deploy-coveralls.sh
index 13960155c9c3ad89a8cea79adc0a18166f19eb35..738f28124bb2bd2b948253b7b6a6531bb64ebcd8 100755 (executable)
--- a/ci/deploy-coveralls.sh
+++ b/ci/deploy-coveralls.sh
@@ -3,4 +3,4 @@
 set -xe
 
 pip install --user cpp-coveralls
-coveralls --root src --exclude src/optparse.c --gcov-options '\-lp'
+coveralls --build-root src --exclude src/optparse.c --exclude ci --exclude config.h --gcov-options '\-lp'