Merge pull request #982 from salimane/pr_ruby_2_1_0

Add Ruby 2.1.0 to .travis.yml build matrix as "allowed to fail"
formtastic · Apr 5, 2014 · ead9700 · ead9700
2 parents 9904fc4 + 7d1719a
commit ead9700
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
-before_install: 
+before_install:
   - gem update --system
   - gem update bundler
 rvm:
   - 1.8.7
   - ree
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
 gemfile:
   - gemfiles/rails_3.0.gemfile
   - gemfiles/rails_3.1.gemfile
@@ -21,6 +23,9 @@ matrix:
     - 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
@@ -32,11 +37,20 @@ matrix:
       env: DEFER_GC=false RAILS_EDGE=true
     - rvm: 2.0.0
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true    
+      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
       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_4.gemfile
+      env: DEFER_GC=false RAILS_EDGE=true
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails_edge.gemfile
+      env: DEFER_GC=false RAILS_EDGE=true