From e981ac6c4852f27a322cab63c9f7605b2d06efb7 Mon Sep 17 00:00:00 2001 From: Wasif Hossain Date: Mon, 5 Aug 2019 02:50:03 +0600 Subject: [PATCH] Require jruby 9.1.x (ruby2.3) and 9.2.x (ruby2.5) to pass on Travis 9.1.x should pass against the following rails versions: - 4.1 - 4.2 - 5.0 - 5.1 - 5.2 9.2.x should pass against the following rails versions: - 4.2 - 5.0 - 5.1 - 5.2 - 6.0 --- .travis.yml | 57 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c2b607a..53ece8b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,19 @@ jdk_supported_versions: rails_supported_versions: - &rails_4_1 RAILS_VERSION=4.1 + - &rails_4_1_jruby RAILS_VERSION=4.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_4_2 RAILS_VERSION=4.2 + - &rails_4_2_jruby RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_5_0 RAILS_VERSION=5.0 + - &rails_5_0_jruby RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_5_1 RAILS_VERSION=5.1 + - &rails_5_1_jruby RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_5_2 RAILS_VERSION=5.2 + - &rails_5_2_jruby RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_6_0 RAILS_VERSION=6.0.0.rc2 + - &rails_6_0_jruby RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug' - &rails_master RAILS_VERSION=master + - &rails_master_jruby RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug' cache: directories: @@ -65,25 +72,26 @@ branches: matrix: include: - - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=4.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_1, jdk: *jdk_8, env: "RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } + - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_4_1_jruby } + - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_4_2_jruby } + - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_5_0_jruby } + - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_5_1_jruby } + - { rvm: *jruby_9_1, jdk: *jdk_8, env: *rails_5_2_jruby } - - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_9_2, jdk: *jdk_8, env: "RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_4_2_jruby } + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_0_jruby } + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_1_jruby } + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_5_2_jruby } + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_6_0_jruby } + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_master_jruby } + + - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_4_2_jruby } + - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_0_jruby } + - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_1_jruby } + - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_5_2_jruby } + - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_6_0_jruby } + - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_master_jruby } - - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=4.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=5.2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=6.0.0.rc2 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } - - { rvm: *jruby_head, jdk: *jdk_8, env: "RAILS_VERSION=master JRUBY_OPTS='--dev -J-Xmx1024M --debug'" } exclude: - { rvm: *ruby_2_1, env: *rails_5_0 } - { rvm: *ruby_2_1, env: *rails_5_1 } @@ -104,22 +112,13 @@ matrix: - { rvm: *ruby_2_5, env: *rails_4_1 } - { rvm: *ruby_2_6, env: *rails_4_1 } - # allow RAILS_VERSION=master to fail against ruby 2.5+ until this gem supports RAILS_VERSION - # https://github.com/rails/rails/blob/master/RAILS_VERSION - # https://github.com/rails-api/active_model_serializers/blob/0-10-stable/active_model_serializers.gemspec#L24 - { rvm: *ruby_2_5, env: *rails_master } - { rvm: *ruby_2_6, env: *rails_master } - rvm: *ruby_head - # - { rvm: *ruby_head, env: *rails_4_1 } - # - { rvm: *ruby_head, env: *rails_4_2 } - # - { rvm: *ruby_head, env: *rails_5_0 } - # - { rvm: *ruby_head, env: *rails_5_1 } - # - { rvm: *ruby_head, env: *rails_5_2 } - # - { rvm: *ruby_head, env: *rails_6_0 } - # - { rvm: *ruby_head, env: *rails_master } - - rvm: *jruby_9_1 - - rvm: *jruby_9_2 + - { rvm: *jruby_9_2, jdk: *jdk_8, env: *rails_master_jruby } + - rvm: *jruby_head + fast_finish: true