From f3967acf6191bfcba4b292b0f55e65205399d456 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Wed, 8 Jun 2016 12:04:49 +0300 Subject: [PATCH] fixing badges + minor fixes to travis and appveyor configs --- .travis.yml | 7 ++----- README.md | 6 +++--- appveyor.yml | 2 +- codecov.yml | 11 +++++++++++ 4 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 codecov.yml diff --git a/.travis.yml b/.travis.yml index c546743b..0bfc16c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ # .travis.yml -sudo: true +sudo: false git: depth : 5 branches: @@ -36,9 +36,7 @@ matrix: addons: apt: sources: ['george-edison55-precise-backports', 'ubuntu-toolchain-r-test', 'llvm'] - #sources: ['george-edison55-precise-backports', 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7'] packages: ['cmake', 'cmake-data', 'g++-4.8', 'clang'] - #packages: ['cmake', 'cmake-data', 'g++-4.8', 'clang-3.7'] before_install: - env - if [ $TRAVIS_OS_NAME == linux ]; then cat /proc/cpuinfo; fi @@ -46,7 +44,6 @@ before_install: - if [ "$VMF_GCOV_OPTS" != "" ]; then pip install --user cpp-coveralls; pip install --user codecov; fi # android - if [ "$VMF_ANDROID_BUILD" != "" ]; then time git clone --depth=1 https://github.com/apavlenko/android-ndk.git $HOME/android-ndk; export ANDROID_NDK=$HOME/android-ndk; fi - #- if [ "$VMF_ANDROID_BUILD" != "" ]; then android list; fi - if [ "$VMF_ANDROID_BUILD" != "" ]; then android-update-sdk --components=sys-img-${VMF_CPU_ARCH}-${VMF_API_LEVEL}; fi before_script: - mkdir ../build @@ -70,7 +67,7 @@ after_success: - cd $TRAVIS_BUILD_DIR/../build && pwd # coverage - if [ "$VMF_GCOV_OPTS" != "" ]; then coveralls --exclude build/CMakeFiles --exclude vmf/3rdparty --exclude vmf/modules/vmfcore/test --exclude vmf/modules/vmdatasource/test --gcov-options '\-lp' --gcov gcov-4.8 --root .. --build-root . > /dev/null; fi - - if [ "$VMF_GCOV_OPTS" != "" ]; then codecov --root .. --gcov-exec gcov-4.8 > /dev/null; fi + - if [ "$VMF_GCOV_OPTS" != "" ]; then codecov --root ../vmf --gcov-exec gcov-4.8 > /dev/null; fi notifications: email: false webhooks: https://coveralls.io/webhook?repo_token=jEvkHdxBatpMEmiw1Mo0r2vmUG5vwepAF diff --git a/README.md b/README.md index 20a95469..cd8d366d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://travis-ci.org/01org/vmf.svg?branch=master)](https://travis-ci.org/01org/vmf) -[![Build status](https://ci.appveyor.com/api/projects/status/r5j9ocr4basnm7yj?svg=true)](https://ci.appveyor.com/project/eaniemey/vmf) -[![Coverage Status](https://s3.amazonaws.com/assets.coveralls.io/badges/coveralls_79.svg)](https://coveralls.io/repos/github/01org/vmf/badge.svg?branch=master) -[![codecov.io](https://codecov.io/github/01org/vmf/coverage.svg?branch=master)](https://codecov.io/github/01org/vmf?branch=master) +[![Build status](https://ci.appveyor.com/api/projects/status/github/01org/vmf?branch=master&svg=true)](https://ci.appveyor.com/project/eaniemey/vmf) +[![Coverage Status](https://coveralls.io/repos/github/01org/vmf/badge.svg?branch=master)](https://coveralls.io/github/01org/vmf) +[![codecov.io](https://codecov.io/github/01org/vmf/coverage.svg?branch=master)](https://codecov.io/github/01org/vmf) Video Metadata Framework ------------------------ diff --git a/appveyor.yml b/appveyor.yml index b6fdf6d1..d1e55be3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ clone_depth: 1 branches: only: - - vmf-3.0 + - master before_build: - mkdir _build diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 00000000..861e5f43 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,11 @@ +# codecov.yml +comment: + layout: header, changes, diff +coverage: + ignore: + - 3rdparty/.* + - CMakeFiles/.* + - test/.* + - modules/vmdatasource/test/.* + - modules/vmfcore/test/.* + - usr/lib/.*