From 2a1ad1311a3559d894ee1d26ccdd21078619d43e Mon Sep 17 00:00:00 2001 From: Snaipe Date: Wed, 16 Sep 2015 01:43:26 +0200 Subject: [PATCH] Cleaned up CI configs --- .travis.yml | 48 +++++++++++++++++++++++++----------------------- appveyor.yml | 2 -- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10e19f4..44e5e2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,32 +15,34 @@ addons: packages: - gcc-4.9 - g++-4.9 - -before_install: -- export GCOV="gcov-4.9" -- export LOCAL_INSTALL="$HOME" -- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib -- export CFLAGS="-g -O0" -- export CXX="g++-4.9" -script: -- mkdir -p build -- cd build -- cmake -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$HOME -DCMAKE_INSTALL_PREFIX=criterion-${TRAVIS_TAG} .. -- make -- make criterion_tests -- make test -after_success: -- make gcov -- bash <(curl -s https://codecov.io/bash) -after_failure: -- cat Testing/Temporary/LastTest.log samples/*.{out,err} ../samples/tests/*.{out,err} env: - global: - secure: bzZcWjdqoTgceC40kEBucx7NuWYJPk+rxgF3UJJDXi+ijQAFYPv70p5eVsGR6rfc+XgqXCxcUFQtuL4ZVt7QEfVk1ZOJITNeHbKIeKaEYS4nX8mFf+CBeEm9bJGZ04KiQJdJu5mzzAHvXbW7roGXDGWe1Bjnk5wwA+dNUCa7H04= + GCOV: gcov-4.9 + CXX: g++-4.9 + +script: + - mkdir -p build + - cd build + - > + cmake + -Wno-dev + -DCOVERALLS=ON + -DCMAKE_BUILD_TYPE=Debug + -DCMAKE_INSTALL_PREFIX=criterion-${TRAVIS_TAG} + .. + - make + - make criterion_tests + - make test + +after_success: + - make gcov + - bash <(curl -s https://codecov.io/bash) + +after_failure: + - cat Testing/Temporary/LastTest.log samples/*.{out,err} ../samples/tests/*.{out,err} before_deploy: -- make install -- tar -cvjf criterion-${TRAVIS_TAG}-${TRAVIS_OS_NAME}-x86_64.tar.bz2 criterion-${TRAVIS_TAG} + - make install + - tar -cvjf criterion-${TRAVIS_TAG}-${TRAVIS_OS_NAME}-x86_64.tar.bz2 criterion-${TRAVIS_TAG} deploy: provider: releases diff --git a/appveyor.yml b/appveyor.yml index c277651..c65ffb7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,6 @@ environment: secure: 5nuCg+faxFPeppoNNcSwVobswAVFUf8ut83vw8CX/4W2y0kZkGmwEfCUxSQWiQDU CI_NAME: appveyor CI_JOB_ID: $(APPVEYOR_JOB_ID) - LOCAL_INSTALL: $(APPVEYOR_BUILD_FOLDER) GCOV_PREFIX: $(APPVEYOR_BUILD_FOLDER) matrix: - COMPILER: mingw @@ -36,7 +35,6 @@ install: cmake -Wno-dev -DCMAKE_INSTALL_PREFIX="criterion-%RELEASE_NAME%" - -DCMAKE_PREFIX_PATH="%LOCAL_INSTALL%" -G "%GENERATOR%" ..