Update .travis.yml

Cut back builds as in `develop`.
xrq-phys · Dec 15, 2020 · 3dd4acb · 3dd4acb
1 parent f5c0609
commit 3dd4acb
Showing 1 changed file with 14 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,40 +3,20 @@ dist: bionic
 sudo: required
 osx_image: xcode12.2
 
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
-
-env:
-  - TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto"
-  - TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference"
-  - TEST_INSTALL=1 RUN_TEST=0 THREADING="none" BUILD_CONFIG="auto"
-  - TEST_INSTALL=0 RUN_TEST=0 THREADING="openmp" BUILD_CONFIG="auto"
-  - TEST_INSTALL=0 RUN_TEST=0 THREADING="pthreads" BUILD_CONFIG="auto"
-  - TEST_INSTALL=0 RUN_TEST=0 THREADING="tbb" BUILD_CONFIG="auto"
-
-matrix:
-  exclude:
-    - env: TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto"
-      os: osx
-    - env: TEST_INSTALL=0 RUN_TEST=1 THREADING="none" BUILD_CONFIG="reference"
+jobs:
+  include:
+    - env: TEST_INSTALL=1 RUN_TEST=1 THREADING="pthread" BUILD_CONFIG="auto" CC=clang
       os: osx
-    - env: TEST_INSTALL=1 RUN_TEST=0 THREADING="none" BUILD_CONFIG="auto"
-      os: osx
-    - env: TEST_INSTALL=0 RUN_TEST=0 THREADING="tbb" BUILD_CONFIG="auto"
-      os: osx
-
-before_install:
-  - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        rm /usr/local/include/c++;
-        brew update && brew install gcc@9 tbb llvm@9;
-        rm /usr/local/include/c++;
-        brew link --force --overwrite llvm@9;
-    fi'
+    - env: TEST_INSTALL=1 RUN_TEST=1 THREADING="openmp" BUILD_CONFIG="auto" CC=gcc
+      os: linux
+    - env: TEST_INSTALL=1 RUN_TEST=1 THREADING="pthread" BUILD_CONFIG="auto" CC=gcc
+      os: linux
+    - env: TEST_INSTALL=1 RUN_TEST=1 THREADING="tbb" BUILD_CONFIG="auto" CC=gcc
+      os: linux
+    - env: TEST_INSTALL=1 RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto" CC=gcc
+      os: linux
+    - env: TEST_INSTALL=1 RUN_TEST=1 THREADING="none" BUILD_CONFIG="auto" CC=clang
+      os: linux
 
 addons:
   apt:
@@ -60,7 +40,7 @@ install:
         if [ "$TRAVIS_OS_NAME" = "linux" ]; then
             export CC="clang-6.0 -fopenmp=libiomp5" CXX="clang++-6.0 -fopenmp=libiomp5";
         else
-            export CC="clang-9" CXX="clang++";
+            export CC="clang" CXX="clang++";
         fi;
     fi'