ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1496 from nadavshatz/add-jruby-to-ci

Browse Source 
Run all branches against JRuby on CI
This commit is contained in:
L. Preston Sego III 2016-03-08 07:26:20 -05:00
commit b3c6c7eadd
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -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

1
CHANGELOG.md
View File

@ -31,6 +31,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