Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run all branches against JRuby on CI #1496

Merged
merged 1 commit into from
Mar 8, 2016
Merged

Run all branches against JRuby on CI #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down