From 84b87e7d92278531f5a7af24c45b8ca5d149d174 Mon Sep 17 00:00:00 2001 From: Nadav Shatz Date: Thu, 4 Feb 2016 18:37:09 -0500 Subject: [PATCH] Run all branches against JRuby on CI --- .travis.yml | 18 ++++++++++++++++-- CHANGELOG.md | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 422e849d..c36b4691 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,14 @@ rvm: - 2.3.0 - ruby-head - rbx-2 + - jruby-9.0.4.0 + - jruby-head + +jdk: + - oraclejdk8 + +before_install: + - '[ "$JRUBY_OPTS" != "" ] && export JRUBY_OPTS="--dev -Xcli.debug=true --debug"' install: bundle install --path=vendor/bundle --retry=3 --jobs=3 cache: @@ -30,10 +38,16 @@ matrix: env: RAILS_VERSION=master - rvm: 2.1 env: RAILS_VERSION=master - include: - rvm: jruby-9.0.4.0 - env: JRUBY_OPTS='-Xcompat.version=2.0 --server -Xcompile.invokedynamic=false -Xcli.debug=true --debug' + env: RAILS_VERSION=master + - rvm: jruby-9.0.4.0 + env: RAILS_VERSION=4.0 + - rvm: jruby-head + env: RAILS_VERSION=master + - rvm: jruby-head + env: RAILS_VERSION=4.0 allow_failures: - rvm: ruby-head + - rvm: jruby-head - rvm: rbx-2 fast_finish: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 1466f340..da15aab9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ Fixes: - [#1488](https://github.com/rails-api/active_model_serializers/pull/1488) Require ActiveSupport's string inflections (@nate00) Misc: +- [#1496](https://github.com/rails-api/active_model_serializers/pull/1496) Run all branches against JRuby on CI (@nadavshatz) - [#1559](https://github.com/rails-api/active_model_serializers/pull/1559) Add a deprecation DSL. (@bf4 @groyoh) - [#1543](https://github.com/rails-api/active_model_serializers/pull/1543) Add the changes missing from #1535. (@groyoh) - [#1535](https://github.com/rails-api/active_model_serializers/pull/1535) Move the adapter and adapter folder to