diff --git a/.travis.yml b/.travis.yml index c2b2cfa..d0b773c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,17 @@ dist: trusty env: global: - secure: "CoI8hwHH1yfQoQxIfWGRS0WfTyScox+5aJn0fDDgz2uKrrIxmBvIw/WKX8wcSiV6fLmLuwgNkKqSM3hdO4qaG+JxfWcuEiZZHm+kxSGMkWbGb/fvAI+gHg8ldKyYttcIX71O5rlZiC2QpNKQi2v18S6pI5p8eqnx7DYx4YrmguQ=" + # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created + # via the "travis encrypt" command using the project repo's public key + - secure: "C9ZJ9LYnuowRdF4D66KLfquimvu8GtRGIafwvCcGYKReEy8phlBdFsHlybkMBNYJNTJSM0j6wyo1lKTVGHxmpQDimjR7kmxUtawbhuJ5qOCBtFqNVh9lRQi7hC4+UOhvRsIcbV8HAJM5u/5RxGOfXCePK3a2DtiYv1d2NHToZN8=" compiler: - gcc before_install: - sudo apt-get update -qq - sudo apt-get install libcap2-bin - - sudo apt-get install traceroute - - traceroute google.com + #- sudo apt-get install traceroute + #- traceroute google.com + - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- install: - ci/build-1-autotools.sh - curl -L http://cpanmin.us | perl - --sudo App::cpanminus @@ -24,3 +28,13 @@ script: after_success: - ci/coveralls.sh - ci/deploy-bintray.sh + +addons: + coverity_scan: + project: + name: "schweikert/fping" + description: "Build submitted via Travis CI" + notification_email: david@schweikert.ch + #build_command_prepend: "ci/build-2-install.sh" + build_command: "ci/build-2-install.sh" + branch_pattern: coverity_scan diff --git a/ChangeLog b/ChangeLog index c2b348e..09fc592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Unreleased +2017-02-09 * Version 3.16 * (feature) Support kernel-timestamping of received packets (#46) * (feature) Simplify restrictions: only -i >= 1 and -p >= 10 are enforced now diff --git a/ci/deploy-bintray.sh b/ci/deploy-bintray.sh index dcb53d1..95219a3 100755 --- a/ci/deploy-bintray.sh +++ b/ci/deploy-bintray.sh @@ -10,9 +10,9 @@ set -e # exit 0 #fi -# do this only for the master branch -if [ "$TRAVIS_BRANCH" != "master" ]; then - echo "skipped upload branch $TRAVIS_BRANCH isn't master" +# do this only for the master and version3 branch +if [ "$TRAVIS_BRANCH" != "master" -a "$TRAVIS_BRANCH" != "version3" ]; then + echo "skipped upload branch $TRAVIS_BRANCH isn't master/version3" exit 0 fi diff --git a/configure.ac b/configure.ac index b6bbc49..f2ea4f7 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. dnl Minimum Autoconf version required. AC_PREREQ(2.59) -AC_INIT([fping],[3.16-rc1]) +AC_INIT([fping],[3.16]) dnl make ipv4 and ipv6 options AC_ARG_ENABLE([ipv4],