diff --git a/.travis.yml b/.travis.yml index 2b79696091..93397b7ee7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,22 @@ node_js: - 0.10 - 0.12 - 4 +# node_js 4 requires gcc 4.8 env: - - NODE_ENV=travis + - NODE_ENV=travis CXX="g++-4.8" matrix: allow_failures: - node_js: 4 services: - mongodb +# gcc 4.8 requires ubuntu-toolchain-r-test +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - gcc-4.8 before_install: - gem update --system - gem install sass --version "=3.3.7" diff --git a/package.json b/package.json index cf9293ae3c..e4a8828805 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "passport-twitter": "^1.0.2", "phantomjs": ">=1.9.0", "serve-favicon": "^2.3.0", - "socket.io": "^1.3.5", + "socket.io": "^1.3.7", "swig": "^1.4.2", "validator": "^3.41.2" },