From fb8082ba2604b139895831af18fca1d18dd91732 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 12 Apr 2019 08:55:02 +0200 Subject: Remove sphinx-build on osx --- .travis.yml | 122 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 62 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index dbb7315c..530a9231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,68 +7,69 @@ git: matrix: include: - # # A. Linux - # - os: linux - # dist: xenial - # compiler: gcc - # env: - # # 1. Only examples and associated tests - # - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' - # - os: linux - # dist: xenial - # compiler: gcc - # env: - # # 2. Only unitary tests - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' - # - os: linux - # dist: xenial - # compiler: gcc - # env: - # # 3. Only utilities and associated tests - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test' - # - os: linux - # dist: xenial - # compiler: gcc - # env: - # # 4. Only doxygen documentation - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' - # - os: linux - # dist: xenial - # compiler: gcc - # env: - # # 5. Only Python, associated tests and sphinx documentation - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' - # # A. Mac OSX - # - os: osx - # osx_image: xcode9.4 - # compiler: clang - # env: - # # 1. Only examples and associated tests - # - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' - # - os: osx - # osx_image: xcode9.4 - # compiler: clang - # env: - # # 2. Only unitary tests - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' - # - os: osx - # osx_image: xcode9.4 - # compiler: clang - # env: - # # 3. Only utilities and associated tests - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test' - # - os: osx - # osx_image: xcode9.4 - # compiler: clang - # env: - # # 4. Only doxygen documentation - # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' + # A. Linux + - os: linux + dist: xenial + compiler: gcc + env: + # 1. Only examples and associated tests + - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - os: linux + dist: xenial + compiler: gcc + env: + # 2. Only unitary tests + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - os: linux + dist: xenial + compiler: gcc + env: + # 3. Only utilities and associated tests + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - os: linux + dist: xenial + compiler: gcc + env: + # 4. Only doxygen documentation + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' + - os: linux + dist: xenial + compiler: gcc + env: + # 5. Only Python, associated tests and sphinx documentation + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' + # A. Mac OSX - os: osx osx_image: xcode9.4 compiler: clang env: - # 5. Only Python, associated tests and sphinx documentation - - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' + # 1. Only examples and associated tests + - CMAKE_EXAMPLE='ON' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - os: osx + osx_image: xcode9.4 + compiler: clang + env: + # 2. Only unitary tests + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='ON' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - os: osx + osx_image: xcode9.4 + compiler: clang + env: + # 3. Only utilities and associated tests + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='ON' CMAKE_PYTHON='OFF' MAKE_TARGET='test' + - os: osx + osx_image: xcode9.4 + compiler: clang + env: + # 4. Only doxygen documentation + - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='OFF' MAKE_TARGET='doxygen' + # Issue with sphinx-build with sphinx 2.0.1 + # - os: osx + # osx_image: xcode9.4 + # compiler: clang + # env: + # # 5. Only Python, associated tests and sphinx documentation + # - CMAKE_EXAMPLE='OFF' CMAKE_TEST='OFF' CMAKE_UTILITIES='OFF' CMAKE_PYTHON='ON' MAKE_TARGET='test sphinx' cache: directories: @@ -118,10 +119,7 @@ script: - mkdir -p build - cd build - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUDHI_EXAMPLE=${CMAKE_EXAMPLE} -DWITH_GUDHI_TEST=${CMAKE_TEST} -DWITH_GUDHI_UTILITIES=${CMAKE_UTILITIES} -DWITH_GUDHI_PYTHON=${CMAKE_PYTHON} -DUSER_VERSION_DIR=version -DPython_ADDITIONAL_VERSIONS=3 .. - - make all - - echo ${MAKE_TARGET} - - which sphinx-build - - ctest -R sphinx_py_test -V + - make all ${MAKE_TARGET} - cd .. notifications: -- cgit v1.2.3