Travis: added DEPENDENCY_VERSION to the name of the releases

cchampet · cchampet · commit 9ec023f2105e · 2015-12-10T10:35:50.000+01:00
Fix #188
diff --git a/.travis.yml b/.travis.yml
@@ -21,10 +21,10 @@ env:
      - DEPENDENCY_INSTALL=install-dependency
      - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${DEPENDENCY_INSTALL}
   matrix:
-    - DEPENDENCY_NAME=libav ENABLE_COVERAGE=true
-    - DEPENDENCY_NAME=libav ENABLE_COVERAGE=false
-    - DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=true
-    - DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
+    - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=false
 
 matrix:
   # generate coverage only with gcc
@@ -85,13 +85,13 @@ before_deploy:
   - if [ ${TRAVIS_OS_NAME} = "linux" ]; then cp /lib/x86_64-linux-gnu/{libbz2.so.1,libbz2.so.1.0,libbz2.so.1.0.4} ${DEPENDENCY_INSTALL_PATH}/lib; fi
   # create archive
   - cd ${TRAVIS_BUILD_DIR}
-  - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
+  - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
 
 deploy:
   provider: releases
   api_key:
     secure: ${GITHUB_RELEASE_API_KEY}
-  file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}.tgz
+  file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz
   skip_cleanup: true
   on:
     branch: master
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -9,19 +9,17 @@ if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
 
     if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
 
-        export FFMPEG_VERSION=2.2.9
-        wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
-        bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2
-        tar -xvf ffmpeg-${FFMPEG_VERSION}.tar
-        cd ffmpeg-${FFMPEG_VERSION}
+        wget https://www.ffmpeg.org/releases/ffmpeg-${DEPENDENCY_VERSION}.tar.bz2
+        bunzip2 ffmpeg-${DEPENDENCY_VERSION}.tar.bz2
+        tar -xvf ffmpeg-${DEPENDENCY_VERSION}.tar
+        cd ffmpeg-${DEPENDENCY_VERSION}
         ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install
 
     elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then
 
-        export LIBAV_VERSION=11.3
-        wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
-        tar -xvf libav-${LIBAV_VERSION}.tar.gz
-        cd libav-${LIBAV_VERSION}
+        wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz
+        tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz
+        cd libav-${DEPENDENCY_VERSION}
         ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install
 
     fi
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -19,10 +19,10 @@ brew install freeglut
 if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
     brew install ffmpeg
 elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then
-    export LIBAV_VERSION=11.3
-    wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
-    tar -xvf libav-${LIBAV_VERSION}.tar.gz
-    cd libav-${LIBAV_VERSION}
+
+    wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz
+    tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz
+    cd libav-${DEPENDENCY_VERSION}
     ./configure --disable-yasm --enable-shared --disable-static && make -k && make install
 
 fi
