From 5655b7664c7f02e1a8dc4a2c739bd77aee7d24e8 Mon Sep 17 00:00:00 2001
From: David Schweikert <david@schweikert.ch>
Date: Mon, 3 Aug 2020 22:31:26 +0300
Subject: [PATCH] travis-ci improvements

---
 .travis.yml                 | 19 ++++++++-----------
 ci/build-3-prepare-macos.sh |  5 -----
 ci/deploy-bintray.sh        |  5 -----
 ci/deploy-coveralls.sh      |  2 +-
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0370390..08ddccf 100644
--- 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 75ff33b..09125eb 100755
--- 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 a234f2c..0dc8800 100755
--- 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 1396015..738f281 100755
--- 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'