Merge pull request #209 from cchampet/Travis_deployCleanLib

cchampet · cchampet · commit d9f0194e3fe2 · 2015-07-21T18:49:56.000+02:00
Travis: deploy binaries without --coverage build option
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,3 @@
-env:
-  global:
-     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
-     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
-     - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
-     - CI_NODE_TOTAL=2
-  matrix:
-    - DEPENDENCY_MODE=libav
-    - DEPENDENCY_MODE=ffmpeg
-
 language: cpp
 
 os:
@@ -18,6 +8,21 @@ compiler:
   - gcc
   - clang
 
+env:
+  global:
+     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
+     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
+     - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
+     - CI_NODE_TOTAL=2
+  matrix:
+    - DEPENDENCY_MODE=libav  ENABLE_COVERAGE=true
+    - DEPENDENCY_MODE=libav  ENABLE_COVERAGE=false
+    - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
+    - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false
+
+# This results in a 2×2×2x2 build matrix.
+# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE
+
 before_script:
   - env | sort  
   - date -u
@@ -26,7 +31,7 @@ before_script:
   - cd ${TRAVIS_BUILD_DIR}
 
   # install coverage tools
-  - ./tools/travis.gcc.install.coverage.sh
+  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
 
   # install avtranscoder dependencies
   - if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
@@ -36,7 +41,7 @@ script:
   # build
   - mkdir -p ${AVTRANSCODER_BUILD}
   - cd ${AVTRANSCODER_BUILD}
-  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
+  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}
   - make -j${CI_NODE_TOTAL}
   - make install
 
@@ -47,21 +52,19 @@ after_success:
   - cd ${TRAVIS_BUILD_DIR}
 
   # generate coverage for coveralls
-  - if [ ${CC} = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
+  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
 
 before_deploy:
   # create archive
   - cd ${TRAVIS_BUILD_DIR}
   - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
 
 deploy:
-  # if the commit is tagged, deploy using github release service
   provider: releases
   api_key:
     secure: ${GITHUB_RELEASE_API_KEY}
   file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz
   skip_cleanup: true
   on:
-    tags: true
-    condition: ${TRAVIS_OS_NAME} = "linux"
-
+    branch: master
+    condition: ${ENABLE_COVERAGE} = false
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,7 @@ endif()
 
 # CPP flag to create code coverage report
 if(AVTRANSCODER_COVERAGE)
+	message("Add coverage build option.")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 endif()
 
