diff --git a/.travis.yml b/.travis.yml index faf7d60df..20a141bbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ git: sudo: required dist: trusty +nodejs: + - "4" + notifications: email: false @@ -141,7 +144,6 @@ before_install: sudo mdutil -i off / fi - echo "Using ${JOBS} jobs" - - source ./scripts/install_node.sh 4 - yarn install --ignore-scripts # Bootstrap cmake to be able to run mason - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}.tar.gz" @@ -173,7 +175,16 @@ install: - export OSRM_BUILD_DIR="$(pwd)/build-osrm" - mkdir ${OSRM_BUILD_DIR} && pushd ${OSRM_BUILD_DIR} - export CC=${CCOMPILER} CXX=${CXXCOMPILER} - - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DENABLE_CCACHE=ON -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} + - | + cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + -DENABLE_MASON=${ENABLE_MASON:-OFF} \ + -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} \ + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} \ + -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \ + -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \ + -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \ + -DBUILD_TOOLS=ON \ + -DENABLE_CCACHE=ON - echo "travis_fold:start:MAKE" - make --jobs=${JOBS} - make tests --jobs=${JOBS} @@ -215,8 +226,6 @@ after_success: - | if [ -n "${ENABLE_NODE_BINDINGS}" ]; then - nvm install 4 - nvm use 4 source ./scripts/travis/build.sh ./scripts/travis/publish.sh fi diff --git a/package.json b/package.json index 1d4ebe478..d04a40d31 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "brfs": "^1.4.3", "browserify": "^14.1.0", "docbox": "^1.0.2", + "documentation": "^4.0.0-beta.18", "eslint": "^2.4.0", "tape": "^4.2.2", "uglifyjs": "^2.4.10"