Merge pull request #86 from JohanMabille/ci

Switch to trusty environment on travis
xtensor-stack · Sep 3, 2018 · 6b2507d · 6b2507d
2 parents 661ba5c + 12ec7e6
commit 6b2507d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -21,7 +21,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install xtensor=0.17.0 -c quantstack
+  - conda install xtensor=0.17.3 -c quantstack
   - conda install gtest cmake -c conda-forge
   - conda install m2w64-openblas -c msys2
   # Patch OpenBLASConfig.cmake

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-dist: precise
+dist: trusty
 matrix:
   include:
     - os: linux
@@ -63,28 +63,49 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
           packages:
+            - g++-4.9
             - clang-3.6
       env: COMPILER=clang CLANG=3.6 BLAS=OpenBLAS
     - os: linux
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
+            - llvm-toolchain-trusty-3.9
+          packages:
+            - g++-4.9
+            - clang-3.9
+      env: COMPILER=clang CLANG=3.9 BLAS=OpenBLAS
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
           packages:
-            - clang-3.7
-      env: COMPILER=clang CLANG=3.7 BLAS=OpenBLAS
+            - g++-4.9
+            - clang-4.0
+      env: COMPILER=clang CLANG=4.0 BLAS=OpenBLAS
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - g++-4.9
+            - clang-5.0
+      env: COMPILER=clang CLANG=5.0 BLAS=OpenBLAS
     - os: linux
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
+            - llvm-toolchain-trusty-6.0
           packages:
-            - clang-3.8
-      env: COMPILER=clang CLANG=3.8 BLAS=OpenBLAS
+            - clang-6.0
+      env: COMPILER=clang CLANG=6.0 BLAS=OpenBLAS
     - os: osx
       osx_image: xcode8
       compiler: clang
@@ -124,7 +145,7 @@ install:
     - conda info -a
     - conda install gtest cmake -c conda-forge
     # Install xtensor and BLAS
-    - conda install xtensor=0.17.0 -c quantstack
+    - conda install xtensor=0.17.3 -c quantstack
     - if [[ "$BLAS" == "OpenBLAS" ]]; then
         conda install openblas -c conda-forge;
       elif [[ "$BLAS" == "mkl" ]]; then