diff --git a/.travis.yml b/.travis.yml index 1e62aceb2..aca4d5896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ cache: bundler: true yarn: true rvm: - - 2.5.1 - - 2.3.7 + - 2.6.2 + - 2.5.3 + - 2.3.8 - jruby-9.1.9.0 gemfile: @@ -18,6 +19,8 @@ gemfile: - gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile - gemfiles/rails_5_no_sprockets_webpacker_2.gemfile - gemfiles/rails_5_no_sprockets_webpacker_3.gemfile + - gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile + - gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile # These don't have webpacker: - gemfiles/rails_4.2_sprockets_2.gemfile - gemfiles/rails_4.2_sprockets_3.gemfile @@ -28,23 +31,44 @@ gemfile: matrix: fast_finish: true exclude: - - # all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3 - - rvm: jruby-9.1.9.0 + # Oldest rails does not run on ruby 2.6 + - rvm: 2.6.2 gemfile: gemfiles/rails_4.2_sprockets_4.gemfile + - rvm: 2.6.2 + gemfile: gemfiles/rails_4.2_sprockets_3.gemfile + - rvm: 2.6.2 + gemfile: gemfiles/rails_4.2_sprockets_2.gemfile + - rvm: 2.5.3 + - rvm: 2.3.8 - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile - - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile - - rvm: jruby-9.1.9.0 + + include: + # Oldest rails does not run on ruby 2.6 + - rvm: 2.5.3 + gemfile: gemfiles/rails_4.2_sprockets_4.gemfile + - rvm: 2.5.3 + gemfile: gemfiles/rails_4.2_sprockets_3.gemfile + - rvm: 2.5.3 gemfile: gemfiles/rails_4.2_sprockets_2.gemfile + # Newest gemfiles for universal testing + - rvm: 2.5.3 + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: 2.5.3 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: 2.3.8 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile - rvm: jruby-9.1.9.0 - gemfile: gemfiles/rails_5_no_sprockets.gemfile + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: jruby-9.1.9.0 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile allow_failures: - rvm: jruby-9.1.9.0 + gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile + - rvm: jruby-9.1.9.0 + gemfile: gemfiles/rails_5.2_sprockets_4.gemfile before_install: # Repo for Yarn diff --git a/Appraisals b/Appraisals index 08d2b4194..e25bed5fa 100644 --- a/Appraisals +++ b/Appraisals @@ -4,6 +4,20 @@ appraise 'rails-5.2-sprockets_4' do gem 'turbolinks', '~> 5' end +appraise 'rails-5.2_no_sprockets_webpacker_3' do + gem 'rails', '~> 5.2.0' + gem 'webpacker', '~> 3.0' + gem 'mini_racer', :platforms => :mri + gem 'therubyrhino', :platforms => :jruby +end + +appraise 'rails-5.2_no_sprockets_webpacker_4' do + gem 'rails', '~> 5.2.0' + gem 'webpacker', '~> 4.0' + gem 'mini_racer', :platforms => :mri + gem 'therubyrhino', :platforms => :jruby +end + appraise 'rails-5.1-sprockets_4' do gem 'rails', '~> 5.1.0' gem 'sprockets', '~> 4.0.x' diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile new file mode 100644 index 000000000..c900cfa59 --- /dev/null +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 5.2.0" +gem "webpacker", "~> 3.0" +gem "mini_racer", platforms: :mri +gem "therubyrhino", platforms: :jruby + +gemspec path: "../" diff --git a/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile new file mode 100644 index 000000000..acb280389 --- /dev/null +++ b/gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +gem "rails", "~> 5.2.0" +gem "webpacker", "~> 4.0" +gem "mini_racer", platforms: :mri +gem "therubyrhino", platforms: :jruby + +gemspec path: "../" diff --git a/react-rails.gemspec b/react-rails.gemspec index e9cb028c9..b2242c96d 100644 --- a/react-rails.gemspec +++ b/react-rails.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.email = ['paul@oshannessy.com', 'rmosolgo@gmail.com', 'neonmd@hotmail.co.uk', 'info@ttanimichi.com'] s.add_development_dependency 'appraisal' - s.add_development_dependency 'bundler', '>= 1.2.2' + s.add_development_dependency 'bundler', '>= 1.2.2', '< 2.0' s.add_development_dependency 'codeclimate-test-reporter' s.add_development_dependency 'coffee-rails' s.add_development_dependency 'es5-shim-rails', '>= 2.0.5'