Use ninja in travis

This commit is contained in:
David Capello 2018-08-29 11:10:51 -03:00
parent dcc4abdeeb
commit 03d363d1a6

View File

@ -6,11 +6,12 @@ matrix:
osx_image: xcode9 osx_image: xcode9
env: env:
- ENABLE_UI=ON - ENABLE_UI=ON
- MATRIX_EVAL="wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip && unzip ninja-mac.zip && export PATH=$PWD:$PATH"
- os: linux - os: linux
addons: addons:
apt: apt:
packages: packages:
- libpixman-1-dev libfreetype6-dev libharfbuzz-dev libx11-dev libxcursor-dev - libpixman-1-dev libfreetype6-dev libharfbuzz-dev libx11-dev libxcursor-dev ninja-build
env: env:
- ENABLE_UI=OFF - ENABLE_UI=OFF
- XVFB=xvfb-run - XVFB=xvfb-run
@ -18,7 +19,7 @@ matrix:
addons: addons:
apt: apt:
packages: packages:
- libpixman-1-dev libfreetype6-dev libharfbuzz-dev libx11-dev libxcursor-dev - libpixman-1-dev libfreetype6-dev libharfbuzz-dev libx11-dev libxcursor-dev ninja-build
env: env:
- ENABLE_UI=ON - ENABLE_UI=ON
- XVFB=xvfb-run - XVFB=xvfb-run
@ -28,7 +29,7 @@ matrix:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-7 libpixman-1-dev libfreetype6-dev libharfbuzz-dev libx11-dev libxcursor-dev - g++-7 libpixman-1-dev libfreetype6-dev libharfbuzz-dev libx11-dev libxcursor-dev ninja-build
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- ENABLE_UI=ON - ENABLE_UI=ON
@ -40,10 +41,10 @@ before_install:
before_script: before_script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DENABLE_TESTS=ON -DENABLE_UI=$ENABLE_UI - cmake .. -G Ninja -DENABLE_TESTS=ON -DENABLE_UI=$ENABLE_UI
script: script:
- make - ninja
- | - |
if $XVFB ctest --output-on-failure ; then if $XVFB ctest --output-on-failure ; then
if [[ "$ENABLE_UI" == "OFF" ]]; then if [[ "$ENABLE_UI" == "OFF" ]]; then