Merge pull request #1 from Microsoft/master

Update
takumif · Nov 23, 2015 · 7a5c553 · 7a5c553
2 parents 47eb735 + 28e29d7
commit 7a5c553
Show file tree

Hide file tree

Showing 117 changed files with 1,594 additions and 1,658 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 sudo: false
-language: node_js
+language: cpp
 
-node_js:
-  - "0.12"
+os:
+  - linux
+  - osx
 
 addons:
   apt:
@@ -17,8 +18,20 @@ addons:
       - libgtk2.0-0
 
 before_install:
-  - export CXX="g++-4.9" CC="gcc-4.9"
+  - git submodule update --init --recursive
+  - git clone https://github.com/creationix/nvm.git ./.nvm
+  - source ./.nvm/nvm.sh
+  - nvm install 0.12
+  - nvm use 0.12
+  - npm config set python `which python`
+  - npm install -g gulp
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      export CXX="g++-4.9" CC="gcc-4.9";
+    fi
 
 install:
   - ./scripts/npm.sh install
   - gulp electron compile
+
+script:
+  - ./test/run.sh