From 198ddb743334416ba8223f2dc7c9b92c02ea3969 Mon Sep 17 00:00:00 2001 From: Jonas Hermsmeier Date: Fri, 24 Mar 2017 16:57:13 +0100 Subject: [PATCH] chore(travis): Use `node` base, instead of `cpp` (#1216) This changes the `.travis.yml` to use the `node_js` language as a base instead of `cpp` to avoid installing & setting up node manually. Change-Type: patch --- .travis.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4556d1c..cbe455c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,24 @@ -language: cpp +language: node_js sudo: false +node_js: + - "6.1.0" services: - docker +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libstdc++-6-dev + env: global: - - NODE_VERSION="6.1.0" + - CCACHE_TEMPDIR=/tmp/.ccache-temp + - CCACHE_COMPRESS=1 + - CC="clang" + - CXX="clang++" matrix: - TARGET_ARCH=x64 - TARGET_ARCH=x86 @@ -21,16 +33,7 @@ os: - osx before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - rm -rf ~/.nvm; - git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm; - source ~/.nvm/nvm.sh; - nvm --version; - nvm install $NODE_VERSION; - node --version; - npm --version; - npm config set spin=false; - fi + - npm config set spin=false install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then