Merge pull request #1026 from justinfrench/simply-travis-matrix

Simply Travis matrix
formtastic · Apr 13, 2014 · 8718622 · 8718622
2 parents f56c1a0 + 276f6f3
commit 8718622
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+language: ruby
 before_install:
   - gem update --system
   - gem update bundler
@@ -7,35 +8,13 @@ rvm:
   - 2.1.0
 gemfile:
   - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_4.0.4.gemfile
+  - gemfiles/rails_edge.gemfile
 env:
   - DEFER_GC=false RAILS_EDGE=true
 script: "rake spec"
 matrix:
-  include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_4.0.4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_4.0.4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
   allow_failures:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile