@@ -20,12 +20,19 @@ jdk_supported_versions:
2020
2121rails_supported_versions :
2222 - &rails_4_1 RAILS_VERSION=4.1
23+ - &rails_4_1_jruby RAILS_VERSION=4.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2324 - &rails_4_2 RAILS_VERSION=4.2
25+ - &rails_4_2_jruby RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2426 - &rails_5_0 RAILS_VERSION=5.0
27+ - &rails_5_0_jruby RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2528 - &rails_5_1 RAILS_VERSION=5.1
29+ - &rails_5_1_jruby RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2630 - &rails_5_2 RAILS_VERSION=5.2
31+ - &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2732 - &rails_6_0 RAILS_VERSION=6.0.0.rc2
33+ - &rails_6_0_jruby RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2834 - &rails_master RAILS_VERSION=master
35+ - &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'
2936
3037cache :
3138 directories :
@@ -65,25 +72,26 @@ branches:
6572
6673matrix :
6774 include :
68- - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=4.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
69- - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
70- - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
71- - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
72- - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
73-
74- - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
75- - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
76- - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
77- - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
78- - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
79- - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
80-
81- - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
82- - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
83- - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
84- - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
85- - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
86- - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
75+ - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_4_1_jruby }
76+ - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_4_2_jruby }
77+ - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_5_0_jruby }
78+ - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_5_1_jruby }
79+ - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_5_2_jruby }
80+
81+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_4_2_jruby }
82+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_0_jruby }
83+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_1_jruby }
84+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_2_jruby }
85+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_6_0_jruby }
86+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_master_jruby }
87+
88+ - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_4_2_jruby }
89+ - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_0_jruby }
90+ - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_1_jruby }
91+ - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_2_jruby }
92+ - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_6_0_jruby }
93+ - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_master_jruby }
94+
8795 exclude :
8896 - { rvm: *ruby_2_1, env: *rails_5_0 }
8997 - { rvm: *ruby_2_1, env: *rails_5_1 }
@@ -104,22 +112,13 @@ matrix:
104112 - { rvm: *ruby_2_5, env: *rails_4_1 }
105113 - { rvm: *ruby_2_6, env: *rails_4_1 }
106114
107- # allow RAILS_VERSION=master to fail against ruby 2.5+ until this gem supports RAILS_VERSION
108- # https://github.com/rails/rails/blob/master/RAILS_VERSION
109- # https://github.com/rails-api/active_model_serializers/blob/0-10-stable/active_model_serializers.gemspec#L24
110115 - { rvm: *ruby_2_5, env: *rails_master }
111116 - { rvm: *ruby_2_6, env: *rails_master }
112117
113118 - rvm : *ruby_head
114- # - { rvm: *ruby_head, env: *rails_4_1 }
115- # - { rvm: *ruby_head, env: *rails_4_2 }
116- # - { rvm: *ruby_head, env: *rails_5_0 }
117- # - { rvm: *ruby_head, env: *rails_5_1 }
118- # - { rvm: *ruby_head, env: *rails_5_2 }
119- # - { rvm: *ruby_head, env: *rails_6_0 }
120- # - { rvm: *ruby_head, env: *rails_master }
121-
122- - rvm : *jruby_9_1
123- - rvm : *jruby_9_2
119+
120+ - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_master_jruby }
121+
124122 - rvm : *jruby_head
123+
125124 fast_finish : true
0 commit comments