-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade CI environment to Node 10, remove builds for < Node 8
Remove yarn, npm is fast now, and comes with node. Synchronize package-lock.json and package.json
- Loading branch information
Showing
5 changed files
with
1,046 additions
and
7,133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ branches: | |
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/ | ||
|
||
cache: | ||
yarn: true | ||
npm: true | ||
ccache: true | ||
apt: true | ||
directories: | ||
|
@@ -34,7 +34,7 @@ env: | |
- CMAKE_VERSION=3.7.2 | ||
- MASON="$(pwd)/scripts/mason.sh" | ||
- ENABLE_NODE_BINDINGS=On | ||
- NODE="4" | ||
- NODE="10" | ||
|
||
matrix: | ||
fast_finish: true | ||
|
@@ -45,15 +45,15 @@ matrix: | |
# Debug Builds | ||
- os: linux | ||
compiler: "format-taginfo-docs" | ||
env: NODE=6 | ||
env: NODE=10 | ||
sudo: false | ||
before_install: | ||
install: | ||
- source $NVM_DIR/nvm.sh | ||
- nvm install $NODE | ||
- nvm use $NODE | ||
- npm --version | ||
- npm install --ignore-scripts | ||
- npm ci --ignore-scripts | ||
- npm link --ignore-scripts | ||
script: | ||
- ./scripts/check_taginfo.py taginfo.json profiles/car.lua | ||
|
@@ -170,14 +170,6 @@ matrix: | |
after_success: | ||
- ./scripts/travis/publish.sh | ||
|
||
- os: osx | ||
osx_image: xcode9.2 | ||
compiler: "mason-osx-release-node-4" | ||
# we use the xcode provides clang and don't install our own | ||
env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON NODE="4" | ||
after_success: | ||
- ./scripts/travis/publish.sh | ||
|
||
# Shared Library | ||
- os: linux | ||
compiler: "gcc-7-release-shared" | ||
|
@@ -188,54 +180,6 @@ matrix: | |
env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON | ||
|
||
# Node build jobs. These skip running the tests. | ||
- os: linux | ||
sudo: false | ||
compiler: "node-4-mason-linux-release" | ||
addons: | ||
apt: | ||
sources: ['ubuntu-toolchain-r-test'] | ||
packages: ['libstdc++-4.9-dev'] | ||
env: CLANG_VERSION='5.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="4" | ||
install: | ||
- pushd ${OSRM_BUILD_DIR} | ||
- | | ||
cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ | ||
-DENABLE_MASON=${ENABLE_MASON:-OFF} \ | ||
-DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \ | ||
-DENABLE_CCACHE=ON \ | ||
-DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \ | ||
-DENABLE_GLIBC_WORKAROUND=ON | ||
- make --jobs=${JOBS} | ||
- popd | ||
script: | ||
- npm run nodejs-tests | ||
after_success: | ||
- ./scripts/travis/publish.sh | ||
|
||
- os: linux | ||
sudo: false | ||
compiler: "node-4-mason-linux-debug" | ||
addons: | ||
apt: | ||
sources: ['ubuntu-toolchain-r-test'] | ||
packages: ['libstdc++-4.9-dev'] | ||
env: CLANG_VERSION='5.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="4" | ||
install: | ||
- pushd ${OSRM_BUILD_DIR} | ||
- | | ||
cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ | ||
-DENABLE_MASON=${ENABLE_MASON:-OFF} \ | ||
-DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \ | ||
-DENABLE_CCACHE=ON \ | ||
-DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \ | ||
-DENABLE_GLIBC_WORKAROUND=ON | ||
- make --jobs=${JOBS} | ||
- popd | ||
script: | ||
- npm run nodejs-tests | ||
after_success: | ||
- ./scripts/travis/publish.sh | ||
|
||
- os: linux | ||
sudo: false | ||
compiler: "node-8-mason-linux-release" | ||
|
@@ -350,15 +294,10 @@ before_install: | |
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then | ||
sudo mdutil -i off / | ||
fi | ||
- | | ||
if [[ ! -f $(which yarn) ]]; then | ||
npm install -g [email protected] | ||
fi | ||
- export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") | ||
- export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") | ||
- echo "Using ${JOBS} jobs" | ||
- yarn install --ignore-scripts | ||
- yarn check --ignore-scripts --integrity | ||
- npm ci --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" | ||
- CMAKE_DIR="mason_packages/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}" | ||
|
@@ -437,4 +376,4 @@ script: | |
fi | ||
- | | ||
- popd | ||
- yarn test | ||
- npm test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.