From 5a6bdf6836730463b065021713500602b317e2c8 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 16 Jan 2019 23:20:58 +0100 Subject: Clean up a bit our .travis-ci.yml file Credit goes to @szepeviktor, this commit is a straight ripoff of https://github.com/nbs-system/snuffleupagus/pull/273 but without the bits that I'm not fond of, so we can move this forward while still being able to bikeshed around the bust the rest of it if we want to. --- .travis.yml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6ba6f8..8c0c309 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: matrix: include: - env: TARGET="coverity" - php: '7.2' + php: "7.2" script: echo "Coverity, nothing to do." after_success: cat /home/travis/build/nbs-system/snuffleupagus/cov-int/scm_log.txt before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- @@ -15,45 +15,44 @@ matrix: project: name: "nbs-system/snuffleupagus" description: "Build submitted via Travis CI" - notification_email: devnull@nbs-system.com + notification_email: "devnull@nbs-system.com" build_command_prepend: "cd src; phpize; ./configure --enable-snuffleupagus; cd -" build_command: "make debug -j2" - branch_pattern: master + branch_pattern: "master" - env: TARGET="gcc php7.0" CC="gcc" - php: '7.0' + php: "7.0" - env: TARGET="gcc php7.1" CC="gcc" - php: '7.1' + php: "7.1" - env: TARGET="gcc php7.2" CC="gcc" before_install: pip install --user cpp-coveralls - php: '7.2' + php: "7.2" - env: TARGET="gcc php7.3" CC="gcc" - php: '7.3' + php: "7.3" - env: TARGET="gcc php nightly" CC="gcc" - php: nightly + php: "nightly" allow_failures: - env: TARGET="gcc php nightly" CC="gcc" - php: nightly + php: "nightly" script: - - 'if [[ ! "${TARGET}" = *"nightly"* ]]; then - pecl install vld-beta ; - fi' - - cd src + - if [[ ! "${TARGET}" = *"nightly"* ]]; then pecl install vld-beta ; fi + - cd src/ - phpize - ./configure --enable-snuffleupagus --enable-coverage - make -j 2 - TEST_PHP_ARGS="-q" REPORT_EXIT_STATUS=1 make test after_success: - - 'if [ "${TARGET}" = "gcc php7.2" ]; then + - | + if [ "${TARGET}" = "gcc php7.2" ]; then cd ../ - git clone https://github.com/linux-test-project/lcov.git --depth 1 ; - rm -rf ./lcov/examples/ ./lcov/test/ ; - ./lcov/bin/lcov -c -o ./src/COV.info --rc lcov_branch_coverage=1 --base-directory ./src/ --directory . ; - ./lcov/bin/lcov --remove ./src/COV.info "/usr/*" --remove ./src/COV.info "./src/*tweetnacl.c" -o ./src/COV.info --rc lcov_branch_coverage=1 ; - ./lcov/bin/genhtml -o ./src/COV.html ./src/COV.info --branch-coverage ; - coveralls --exclude "./src/tweetnacl.c" ; - fi' + git clone --depth 1 https://github.com/linux-test-project/lcov.git + rm -rf ./lcov/examples/ ./lcov/test/ + ./lcov/bin/lcov -c -o ./src/COV.info --rc lcov_branch_coverage=1 --base-directory ./src/ --directory . + ./lcov/bin/lcov --remove ./src/COV.info "/usr/*" --remove ./src/COV.info "./src/*tweetnacl.c" -o ./src/COV.info --rc lcov_branch_coverage=1 + ./lcov/bin/genhtml -o ./src/COV.html ./src/COV.info --branch-coverage + coveralls --exclude "./src/tweetnacl.c" + fi after_failure: - grep -r . ./tests/*.out -- cgit v1.3