Merge pull request #338 from ssbarnea/master

Build and test execution changes
mermaid-js · Mar 29, 2016 · d585121 · d585121
2 parents 9e49617 + e6fcc2b
commit d585121
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 143,810 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
-node_modules/*
-bower_components/
+node_modules
+dist
+bower_components
+
 *.sublime-project
 *.sublime-workspace
+
 .DS_Store
 .idea
 coverage
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,15 @@
     language: node_js
+    osx_image: xcode7.3
+    os:
+        - linux
+        - osx
     sudo: false
     node_js:
         - "4.2"
+        - "4.4"
+        - "5.9"
     addons:
        code_climate:
          repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091
     after_script:
-        - cat coverage/lcov.info | codeclimate
+        - cat coverage/lcov.info | codeclimate