From 2596a4e9226e7fc093aa95f0d9f9cfd17e366be0 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 27 Apr 2015 10:48:01 +0200 Subject: [PATCH 1/7] Travis: deploy on tag --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 08f7ca96..edec4773 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,3 +34,16 @@ script: - cd .. - chmod +x tools/travis.python.nosetests.sh - if [ "${TRAVIS_OS_NAME}" = "linux" && "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi + +before_deploy: + - cd ${TRAVIS_BUILD_DIR} + - tar -cvzf avtranscoder_install.tgz build/dist/ + +deploy: + provider: releases + api_key: + secure: "${GITHUB_RELEASE_API_KEY}" + file: avtranscoder_install.tgz + skip_cleanup: true + on: + tags: true From b526dd3e51975606b8702240040361b3e180bd0c Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 30 Apr 2015 12:15:00 +0200 Subject: [PATCH 2/7] Travis: deploy ffmpeg/libav dependency --- .travis.yml | 11 ++++++----- tools/travis.linux.install.deps.sh | 4 ++-- tools/travis.python.nosetests.sh | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 011d7d28..c61aacaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ env: global: - - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build - - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install + - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder + - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder + - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency - J='-j3' matrix: - DEPENDENCY_MODE=libav @@ -35,7 +36,7 @@ script: # Build - mkdir -p ${AVTRANSCODER_BUILD} - cd ${AVTRANSCODER_BUILD} - - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_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=True - make $J install # Launch tests @@ -48,8 +49,8 @@ after_success: - if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi before_deploy: - - cd ${AVTRANSCODER_INSTALL} - - tar -cvzf avtranscoder_install.tgz . + - cd ${TRAVIS_BUILD_DIR} + - tar -cvzf avtranscoder_install.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} deploy: provider: releases diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh index c3af0376..a7b54427 100755 --- a/tools/travis.linux.install.deps.sh +++ b/tools/travis.linux.install.deps.sh @@ -16,13 +16,13 @@ if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then sudo bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2 sudo tar -xvf ffmpeg-${FFMPEG_VERSION}.tar cd ffmpeg-${FFMPEG_VERSION} - sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install + sudo ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && sudo make && sudo make install elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then export LIBAV_VERSION=11.3 sudo wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz sudo tar -xvf libav-${LIBAV_VERSION}.tar.gz cd libav-${LIBAV_VERSION} - sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install + sudo ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && sudo make && sudo make install fi diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh index e65a82e7..c1507c4b 100755 --- a/tools/travis.python.nosetests.sh +++ b/tools/travis.python.nosetests.sh @@ -1,6 +1,7 @@ #!/bin/bash # Get avtranscoder library +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH # Get avtranscoder profiles From 4e75c0cf9acce4198cb2daa08fa0886be9e7782f Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 30 Apr 2015 12:20:19 +0200 Subject: [PATCH 3/7] Travis: deploy only if linux build --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c61aacaa..261f1d62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,14 +50,15 @@ after_success: before_deploy: - cd ${TRAVIS_BUILD_DIR} - - tar -cvzf avtranscoder_install.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} + - tar -cvzf avtranscoder-dev-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} deploy: provider: releases api_key: secure: "${GITHUB_RELEASE_API_KEY}" - file: avtranscoder_install.tgz + file: avtranscoder-dev-${DEPENDENCY_MODE}.tgz skip_cleanup: true on: tags: true + condition: ${TRAVIS_OS_NAME} = "linux" From fc442c29babc759df9ab599a7a250719a922bac8 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 30 Apr 2015 13:28:39 +0200 Subject: [PATCH 4/7] Travis: clean --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 261f1d62..bd4b494f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ before_script: - ./tools/travis.gcc.install.coverage.sh # install avtranscoder dependencies - - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi - - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi + - if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi + - if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi script: # Build @@ -40,13 +40,13 @@ script: - make $J install # Launch tests - - if [ "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi + - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi after_success: - cd ${TRAVIS_BUILD_DIR} # generate coverage for coveralls - - if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi + - if [ ${CC} = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi before_deploy: - cd ${TRAVIS_BUILD_DIR} @@ -55,7 +55,7 @@ before_deploy: deploy: provider: releases api_key: - secure: "${GITHUB_RELEASE_API_KEY}" + secure: ${GITHUB_RELEASE_API_KEY} file: avtranscoder-dev-${DEPENDENCY_MODE}.tgz skip_cleanup: true on: From 419439065c468e5768305a7017a3c9a2e4c67e1a Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 30 Apr 2015 17:18:46 +0200 Subject: [PATCH 5/7] Travis: add documentation --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd4b494f..0e8c91e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,13 +33,13 @@ before_script: - if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi script: - # Build + # 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 - make $J install - # Launch tests + # launch tests - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi after_success: @@ -49,10 +49,12 @@ after_success: - if [ ${CC} = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi before_deploy: + # create archive - cd ${TRAVIS_BUILD_DIR} - tar -cvzf avtranscoder-dev-${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} From 473d4386d4e8f7c152b345427821e81a3d965f96 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 30 Apr 2015 17:23:05 +0200 Subject: [PATCH 6/7] Travis: rename the archives deployed --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e8c91e5..e7d48439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,14 +51,14 @@ after_success: before_deploy: # create archive - cd ${TRAVIS_BUILD_DIR} - - tar -cvzf avtranscoder-dev-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} + - 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-dev-${DEPENDENCY_MODE}.tgz + file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz skip_cleanup: true on: tags: true From 2b68780f3df10c62e11474cc6bde0205673bb112 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 4 May 2015 17:47:52 +0200 Subject: [PATCH 7/7] Travis: clean build optimization Fix #183 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7d48439..4ce8383e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ env: - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency - - J='-j3' + - CI_NODE_TOTAL=2 matrix: - DEPENDENCY_MODE=libav - DEPENDENCY_MODE=ffmpeg @@ -37,7 +37,7 @@ script: - 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 - - make $J install + - make -j${CI_NODE_TOTAL} install # launch tests - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi