diff --git a/.travis.yml b/.travis.yml index 6fd555080..14d4c5e20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: global: - CCACHE_TEMPDIR=/tmp/.ccache-temp - CCACHE_COMPRESS=1 + - JOBS=2 matrix: fast_finish: true @@ -111,8 +112,6 @@ matrix: before_install: - source ./scripts/install_node.sh 4 - -install: - npm install - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR} @@ -126,7 +125,7 @@ install: brew install cmake libzip libstxxl lua51 luabind tbb md5sha1sum fi -before_script: +install: - cd ${TRAVIS_BUILD_DIR} - | if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then @@ -136,40 +135,35 @@ before_script: - export CC=${CCOMPILER} CXX=${CXXCOMPILER} - export OSRM_PORT=5000 OSRM_TIMEOUT=6000 - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=ON - -script: - echo "travis_fold:start:MAKE" - - make --jobs=2 - - make tests --jobs=2 - - make benchmarks + - make --jobs=${JOBS} + - make tests --jobs=${JOBS} + - make benchmarks --jobs=${JOBS} - echo "travis_fold:end:MAKE" - - echo "travis_fold:start:INSTALL" + - ccache -s - sudo make install - | if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo ldconfig fi - - echo "travis_fold:end:INSTALL" - - echo "travis_fold:start:BENCHMARK" - - make -C ../test/data benchmark - - echo "travis_fold:end:BENCHMARK" - - echo "travis_fold:start:UNIT_TESTS" - - ./unit_tests/extractor-tests - - ./unit_tests/engine-tests - - ./unit_tests/util-tests - - ./unit_tests/server-tests - - ./unit_tests/library-tests ../test/data/monaco.osrm - - echo "travis_fold:end:UNIT_TESTS" - popd - - echo "travis_fold:start:CUCUMBER" - - npm test - - echo "travis_fold:end:CUCUMBER" - mkdir example/build && pushd example/build - cmake .. - make - - ./osrm-example ../../test/data/monaco.osrm - popd +script: + - echo "travis_fold:start:BENCHMARK" + - make -C test/data benchmark + - echo "travis_fold:end:BENCHMARK" + - ./example/build/osrm-example test/data/monaco.osrm + - ./build/unit_tests/library-tests test/data/monaco.osrm + - ./build/unit_tests/extractor-tests + - ./build/unit_tests/engine-tests + - ./build/unit_tests/util-tests + - ./build/unit_tests/server-tests + - npm test + after_success: - | if [ -n "${RUN_CLANG_FORMAT}" ]; then