travis-ci improvements

pull/196/head
David Schweikert 4 years ago
parent 3bb2811139
commit 5655b7664c

@ -31,17 +31,9 @@ addons:
build_command: "ci/build-3-compile.sh" build_command: "ci/build-3-compile.sh"
branch_pattern: coverity_scan branch_pattern: coverity_scan
install:
- ci/build-2-test-command.sh
- ci/build-3-prepare-macos.sh
script: script:
- ci/build-4-compile.sh - ci/build-4-compile.sh
- ci/run-tests.sh - ci/run-tests.sh
- ci/deploy-bintray.sh
after_success:
- ci/deploy-coveralls.sh
stages: stages:
- test - test
@ -55,20 +47,25 @@ jobs:
name: test trusty name: test trusty
os: linux os: linux
dist: trusty dist: trusty
before_install: install:
- ci/build-1-autotools.sh - ci/build-1-autotools.sh
- name: test xenial - name: test xenial
os: linux os: linux
dist: xenial dist: xenial
after_success:
- ci/deploy-coveralls.sh
- name: test macos - name: test macos
os: osx os: osx
install:
- ci/build-2-test-command.sh
- ci/build-3-prepare-macos.sh
#### STAGE: deploy #### STAGE: deploy
- stage: deploy - stage: deploy
name: deploy name: deploy
os: linux os: linux
dist: xenial dist: xenial
env: after_success:
- DO_DEPLOY=1 - ci/deploy-bintray.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.4/8 alias
sudo ifconfig lo0 127.0.0.5/8 alias sudo ifconfig lo0 127.0.0.5/8 alias
fi fi
if [[ ! $PATH =~ /Users/dws/checkouts/fping/src ]]; then
echo "# WARNING: must set PATH:"
echo PATH=/Users/dws/checkouts/fping/src:\$PATH
fi

@ -4,11 +4,6 @@
set -e 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$//') VERSION=$(ls fping-*.tar.gz | sed -e 's/^fping-//' | sed -e 's/\.tar\.gz$//')
if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+$ ]]; then
REPO=release REPO=release

@ -3,4 +3,4 @@
set -xe set -xe
pip install --user cpp-coveralls 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'

Loading…
Cancel
Save