Switch to clang 3.8 (#814)

[openjpeg.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index fbbcdf390d6299c9817c954521d60fa7cdfac6c7..91ad48116c61755c8d877defcb06c43fd53c9d63 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,10 @@ matrix:
   include:
     - os: osx
       compiler: clang
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_DEPLOY=1
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1
     - os: linux
       compiler: gcc
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_DEPLOY=1
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1
     - os: linux
       compiler: gcc
       env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
@@ -22,9 +22,15 @@ matrix:
       compiler: clang
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
     - os: linux
-      compiler: clang-3.9
+      compiler: clang-3.8
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
-      sudo: true
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-precise-3.8
+            - ubuntu-toolchain-r-test
+          packages:
+            - clang-3.8
     - os: linux
       compiler: x86_64-w64-mingw32-gcc
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
@@ -67,7 +73,7 @@ script:
   - ./tools/travis-ci/abi-check.sh
 
 before_deploy:
-  - export OPJ_RELEASE_PKG_FILE=$(ls *.zip)
+  - export OPJ_RELEASE_PKG_FILE=$(ls build/openjpeg-${TRAVIS_TAG}*)
   - echo "deploying $OPJ_RELEASE_PKG_FILE to GitHub releases"
 
 deploy:
@@ -80,4 +86,5 @@ deploy:
   on:
     repo: uclouvain/openjpeg
     tags: true
+    condition: "$OPJ_CI_INCLUDE_IF_DEPLOY = 1"