aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorBenjamin Fleischer <github@benjaminfleischer.com>2016-02-05 11:31:18 -0600
committerBenjamin Fleischer <github@benjaminfleischer.com>2016-03-30 02:11:45 -0500
commit30279704646fff33e64c71ee3c4de34bf75232c4 (patch)
tree6ee2c941bf9a0ac2984cece36dc6758828982cd5 /Gemfile.lock
parent4232f7ee427a510eb07e420f5883611bcb0abfae (diff)
downloadrails-30279704646fff33e64c71ee3c4de34bf75232c4.tar.gz
rails-30279704646fff33e64c71ee3c4de34bf75232c4.tar.bz2
rails-30279704646fff33e64c71ee3c4de34bf75232c4.zip
Run latest precompiled JRuby on CI only against ActionPack
Uses latest precompiled JRuby so that we don't spend time downloading versions Travis has not already compiled. http://rubies.travis-ci.org/ Uses latest jdk: oraclejdk8 per https://docs.travis-ci.com/user/build-environment-updates/2015-02-03/#Ruby-VM and https://docs.travis-ci.com/user/languages/ruby/#Supported-Ruby-Versions-and-RVM Follows on work in https://github.com/rails/rails/pull/23927 which was reverted https://github.com/rails/rails/commit/26fe5fa08d52384bcea09c4210e3b3baaf5e9b95 JRUBY_OPTS minimize GC, disable JIT, for max test speed - https://github.com/rails/rails/pull/16613 - https://github.com/rails/rails/pull/17088 Have Rails use JRuby-compatible Rake 11.1 - The Rake task was passing --verbose, an invalid option, to contemporary JRuby - https://github.com/ruby/rake/pull/120 - https://github.com/rails-api/active_model_serializers/pull/1585 - https://github.com/jruby/jruby/issues/3653#issuecomment-195883717 No advantage to directly mounting JRuby over installing from cache; both on S3 - https://github.com/rails/rails/pull/23499/commits/b2d5b336b5a812009444571b22eed90777cd9a8c - https://github.com/rails/rails/pull/23499/commits/f4fad041b2755d81e82ee3fc66d96f334b4653db
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c76c4d7c2f..4c64cf9cac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rake (10.5.0)
+ rake (11.1.1)
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)