travis final fix

DTolm · Aug 24, 2020 · 2077a58 · 2077a58
1 parent 711081b
commit 2077a58
Showing 1 changed file with 1 addition and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ env:
 
 matrix:
   include:
-    # Linux, GCC 5
+    # Linux, GCC 5 Vulkan
     - os: linux
       env: COMPILER_C=gcc-5 COMPILER_CXX=g++-5 CMAKE_OPTIONS="-DUSER_PATH_QT=~/opt/qt511" PYPI=false
       compiler: g++
@@ -36,74 +36,6 @@ matrix:
           - sourceline: 'ppa:ubuntu-toolchain-r/test'
           - sourceline: 'ppa:beineri/opt-qt-5.11.1-bionic'
           # - sourceline: 'ppa:jonathonf/python-2.7'
-    # Linux, GCC 6 CUDA build
-    - os: linux
-      env: COMPILER_C=gcc-6 COMPILER_CXX=g++-6 RUNTESTS=false USE_CUDA=true CMAKE_OPTIONS="-DSPIRIT_UI_CXX_USE_QT=OFF -DSPIRIT_USE_CUDA=ON -DSPIRIT_CUDA_ARCH=sm_70" PYPI=false
-      compiler: g++
-      addons:
-        apt:
-          packages:
-          - g++-6
-          - qt511base
-          - qt511charts-no-lgpl
-          - ca-certificates
-          - python2.7
-          - mesa-common-dev
-          sources:
-          - sourceline: 'ppa:ubuntu-toolchain-r/test'
-          - sourceline: 'ppa:beineri/opt-qt-5.11.1-bionic'
-          # - sourceline: 'ppa:jonathonf/python-2.7'
-    # Linux, GCC 6 OpenMP build
-    - os: linux
-      env: COMPILER_C=gcc-6 COMPILER_CXX=g++-6 OMP_NUM_THREADS=4 CMAKE_OPTIONS="-DSPIRIT_UI_CXX_USE_QT=OFF -DSPIRIT_USE_OPENMP=ON" PYPI=false
-      compiler: g++
-      addons:
-        apt:
-          packages:
-          - g++-6
-          - qt511base
-          - qt511charts-no-lgpl
-          - ca-certificates
-          - python2.7
-          - mesa-common-dev
-          sources:
-          - sourceline: 'ppa:ubuntu-toolchain-r/test'
-          - sourceline: 'ppa:beineri/opt-qt-5.11.1-bionic'
-          # - sourceline: 'ppa:jonathonf/python-2.7'
-    # Linux, GCC 6 pinning and defects build
-    - os: linux
-      env: COMPILER_C=gcc-6 COMPILER_CXX=g++-6 CMAKE_OPTIONS="-DSPIRIT_UI_CXX_USE_QT=OFF -DSPIRIT_ENABLE_PINNING=ON -DSPIRIT_ENABLE_DEFECTS=ON" PYPI=false
-      compiler: g++
-      addons:
-        apt:
-          packages:
-          - g++-6
-          - qt511base
-          - ca-certificates
-          - python2.7
-          - mesa-common-dev
-          sources:
-          - sourceline: 'ppa:ubuntu-toolchain-r/test'
-          - sourceline: 'ppa:beineri/opt-qt-5.11.1-bionic'
-          # - sourceline: 'ppa:jonathonf/python-2.7'
-    # Linux, GCC 6 coverage build
-    - os: linux
-      env: COMPILER_C=gcc-6 COMPILER_CXX=g++-6 CMAKE_OPTIONS="-DSPIRIT_UI_CXX_USE_QT=OFF -DSPIRIT_TEST_COVERAGE=ON" PYPI=false COVERAGE=true RUNTESTS=false
-      compiler: g++
-      addons:
-        apt:
-          packages:
-          - g++-6
-          - lcov
-          - qt511base
-          - ca-certificates
-          - python2.7
-          - mesa-common-dev
-          sources:
-          - sourceline: 'ppa:ubuntu-toolchain-r/test'
-          - sourceline: 'ppa:beineri/opt-qt-5.11.1-bionic'
-          # - sourceline: 'ppa:jonathonf/python-2.7'
-
 
 before_install:
   - sudo apt-get install