Pārlūkot izejas kodu

Merge pull request #1094 from libigl/jdumas-patch-1

Prevent Travis from failing due to #1086
Francis Williams 6 gadi atpakaļ
vecāks
revīzija
146a37b892
1 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. 5 5
      .travis.yml

+ 5 - 5
.travis.yml

@@ -27,23 +27,23 @@ matrix:
   - os: linux
   - os: linux
     compiler: gcc # 4.8.4 by default on Trusty
     compiler: gcc # 4.8.4 by default on Trusty
     env:
     env:
-    - MATRIX_EVAL="export CONFIG=Release && PYTHON=python3"
+    - MATRIX_EVAL="export CONFIG=Release PYTHON=python3"
   - os: linux
   - os: linux
     compiler: gcc-7
     compiler: gcc-7
     env:
     env:
-    - MATRIX_EVAL="export CC=gcc-7 && CXX=g++-7 && CONFIG=Release && PYTHON=python3"
+    - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7 CONFIG=Release PYTHON=python3"
   - os: linux
   - os: linux
     compiler: gcc-7
     compiler: gcc-7
     env:
     env:
-    - MATRIX_EVAL="export CC=gcc-7 && CXX=g++-7 && CONFIG=Release && PYTHON=python3 CMAKE_EXTRA='-DLIBIGL_EIGEN_VERSION=3.3.7 -DLIBIGL_EIGEN_MD5=f2a417d083fe8ca4b8ed2bc613d20f07'"
+    - MATRIX_EVAL="export CC=gcc-7 CXX=g++-7 CONFIG=Release PYTHON=python3 CMAKE_EXTRA='-DLIBIGL_EIGEN_VERSION=3.3.7 -DLIBIGL_EIGEN_MD5=f2a417d083fe8ca4b8ed2bc613d20f07'"
   - os: osx
   - os: osx
     compiler: clang
     compiler: clang
     env:
     env:
-    - MATRIX_EVAL="export CONFIG=Debug && PYTHON=python3"
+    - MATRIX_EVAL="export CONFIG=Debug PYTHON=python3 LIBIGL_NUM_THREADS=1"
   - os: osx
   - os: osx
     compiler: clang
     compiler: clang
     env:
     env:
-    - MATRIX_EVAL="export CONFIG=Debug && PYTHON=python3 CMAKE_EXTRA='-DLIBIGL_EIGEN_VERSION=3.3.7 -DLIBIGL_EIGEN_MD5=f2a417d083fe8ca4b8ed2bc613d20f07'""
+    - MATRIX_EVAL="export CONFIG=Debug PYTHON=python3 LIBIGL_NUM_THREADS=1 CMAKE_EXTRA='-DLIBIGL_EIGEN_VERSION=3.3.7 -DLIBIGL_EIGEN_MD5=f2a417d083fe8ca4b8ed2bc613d20f07'""
 
 
 install:
 install:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi