aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-01-23 14:58:53 -0700
committerSean Griffin <sean@seantheprogrammer.com>2015-01-23 14:58:53 -0700
commit9d773cd116601002a2121d6c3858cd0660c87bb0 (patch)
treeb2628a142d5cec0ba22e88af8b5df407eab865e2
parent56040f20b56f236678561b65ef3d03bd2a1f5e25 (diff)
parentf984e8898f6ccc8e118430889dc4af32824b1729 (diff)
downloadrails-9d773cd116601002a2121d6c3858cd0660c87bb0.tar.gz
rails-9d773cd116601002a2121d6c3858cd0660c87bb0.tar.bz2
rails-9d773cd116601002a2121d6c3858cd0660c87bb0.zip
Merge pull request #352 from splattael/jruby-head
Remove jruby and add jruby-head on Travis
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index d6eda2ce61..f7ac50ada5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,12 @@ language: ruby
script:
- "rake test"
- "gem build arel.gemspec"
+env:
+ global:
+ - JRUBY_OPTS='--dev -J-Xmx1024M'
rvm:
- rbx
- - jruby
+ - jruby-head
- 2.0.0
- 2.1
- ruby-head