diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-30 04:27:41 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-30 04:27:41 -0300 |
| commit | e98a0a1d7d935e1b4bb9bce1215aaaa8be812300 (patch) | |
| tree | 467241136c34ad0d72bd82aa690a1bffa0848914 | |
| parent | 2a8c3e53dcafe15e9efd4bfb16d4902ab0f4fbc1 (diff) | |
| parent | 30279704646fff33e64c71ee3c4de34bf75232c4 (diff) | |
| download | rails-e98a0a1d7d935e1b4bb9bce1215aaaa8be812300.tar.gz rails-e98a0a1d7d935e1b4bb9bce1215aaaa8be812300.tar.bz2 rails-e98a0a1d7d935e1b4bb9bce1215aaaa8be812300.zip | |
Merge pull request #23499 from bf4/ci_one_jruby
Run one JRuby worker on CI; allow to fail
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index bd1a320de5..ef85107515 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,13 @@ rvm: - 2.3.0 - ruby-head matrix: + include: + # Latest compiled version in http://rubies.travis-ci.org + - rvm: jruby-9.0.5.0 + jdk: oraclejdk8 + env: + - "JRUBY_OPTS='--dev -J-Xmx1024M'" + - "GEM='ap'" allow_failures: - rvm: ruby-head fast_finish: true @@ -3,7 +3,7 @@ source 'https://rubygems.org' gemspec # We need a newish Rake since Active Job sets its test tasks' descriptions. -gem 'rake', '>= 10.3' +gem 'rake', '>= 11.1' # This needs to be with require false to ensure correct loading order, as it has to # be loaded after loading the test library. 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) |