Merge pull request #926 from ficristo/search-fix

[mirror_xterm.js.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b98cb202c1de595c4258d37825dcf9b40ea8ed7f..1878c3a4d864846959b7747bf671306049d10219 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,19 @@
 language: node_js
+os:
+  - linux
+  - osx
 node_js:
   - 6
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq install g++-4.8 ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-4.8 ; fi
+  - npm install -g npm@5.1.0
 env:
-  global:
-    - CXX=g++-4.8
   matrix:
     - NPM_COMMAND=lint
     - NPM_COMMAND=test
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
 notifications:
   email: false
 script: npm run $NPM_COMMAND