Merge pull request #12614 from stefanpenner/cli-upgrade

upgrade CLI
emberjs · Nov 15, 2015 · 04ec1c6 · 04ec1c6
2 parents c772c60 + caa5958
commit 04ec1c6
Show file tree

Hide file tree

Showing 3 changed files with 6,598 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "iojs"
+  - "5"
 
 sudo: false
 
@@ -13,12 +13,11 @@ cache:
 
 before_install:
   - "npm config set spin false"
-  - "npm install -g npm@^2"
   - "npm --version"
   - "phantomjs --version"
 
 install:
-  - "npm install --no-optional"
+  - "npm install"
 
 after_success:
   - "./bin/publish_builds"