diff --git a/.travis.yml b/.travis.yml index b0f9ee00f..6d72f60ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,11 +23,13 @@ matrix: env: MINICONDA_FILE="Miniconda3-latest-Linux-x86_64.sh" PROJ4_PATH=~/miniconda3 + CAIRO="" - os: osx osx_image: xcode10.1 env: MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" + CAIRO="-D ENABLE_CAIRO=0" env: global: @@ -93,25 +95,16 @@ script: # build - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR} - echo "In build dir--> ${MAGICS_SRC}" - - | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - cmake -D CMAKE_INSTALL_PREFIX=${INSTALL_DIR} + - cmake -D CMAKE_INSTALL_PREFIX=${INSTALL_DIR} -D ENABLE_FORTRAN=0 - ${MAGICS_SRC} - fi - - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - # No Cairo for osx .. - cmake -D CMAKE_INSTALL_PREFIX=${INSTALL_DIR} - -D ENABLE_FORTRAN=0 -D ENABLE_CAIRO=0 - ${MAGICS_SRC} - fi + ${MAGICS_SRC} ${CAIRO} - make -j2 - ctest -j2 --output-on-failure - make install > /dev/null # test only on linux for now - | if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + echo "In build dir--> ${MAGICS_PYTHON_SRC}" cd ${MAGICS_PYTHON_SRC} pytest fi