Skip to content

Commit 4a46a4c

Browse files
authored
Chore/update appraisals (#934)
* ✅ Adding Webpacker-4-prerelease to tests * ✅ Adding Rails 5.2, webpacker 3, 4.pre to travis * ✅ Correcting appraisal * Update to webpacker 4.0.0.pre.3 * Update Webpacker to 4.0.0.rc.2 * ✅ Update Webpacker to 4.0.x * ✅ Upgrade rubies. Add 2.6 * ✅ Update chromedriver-helper to webdriver * 🐛 Restrict bundler to < 2 for tests on Rails 4.2 to run * Revert "✅ Update chromedriver-helper to webdriver" This reverts commit 69305e5. * 💚 Fix Travis matrix for modern rubies * 💚 Include Jruby for allowed failure.
1 parent e030634 commit 4a46a4c

File tree

5 files changed

+71
-13
lines changed

5 files changed

+71
-13
lines changed

.travis.yml

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ cache:
77
bundler: true
88
yarn: true
99
rvm:
10-
- 2.5.1
11-
- 2.3.7
10+
- 2.6.2
11+
- 2.5.3
12+
- 2.3.8
1213
- jruby-9.1.9.0
1314

1415
gemfile:
@@ -18,6 +19,8 @@ gemfile:
1819
- gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
1920
- gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
2021
- gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
22+
- gemfiles/rails_5.2_no_sprockets_webpacker_3.gemfile
23+
- gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
2124
# These don't have webpacker:
2225
- gemfiles/rails_4.2_sprockets_2.gemfile
2326
- gemfiles/rails_4.2_sprockets_3.gemfile
@@ -28,23 +31,44 @@ gemfile:
2831
matrix:
2932
fast_finish: true
3033
exclude:
31-
32-
# all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3
33-
- rvm: jruby-9.1.9.0
34+
# Oldest rails does not run on ruby 2.6
35+
- rvm: 2.6.2
3436
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
37+
- rvm: 2.6.2
38+
gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
39+
- rvm: 2.6.2
40+
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
41+
- rvm: 2.5.3
42+
- rvm: 2.3.8
3543
- rvm: jruby-9.1.9.0
36-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
37-
- rvm: jruby-9.1.9.0
38-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
39-
- rvm: jruby-9.1.9.0
40-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
41-
- rvm: jruby-9.1.9.0
44+
45+
include:
46+
# Oldest rails does not run on ruby 2.6
47+
- rvm: 2.5.3
48+
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
49+
- rvm: 2.5.3
50+
gemfile: gemfiles/rails_4.2_sprockets_3.gemfile
51+
- rvm: 2.5.3
4252
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
53+
# Newest gemfiles for universal testing
54+
- rvm: 2.5.3
55+
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
56+
- rvm: 2.5.3
57+
gemfile: gemfiles/rails_5.2_sprockets_4.gemfile
58+
- rvm: 2.3.8
59+
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
60+
- rvm: 2.3.8
61+
gemfile: gemfiles/rails_5.2_sprockets_4.gemfile
4362
- rvm: jruby-9.1.9.0
44-
gemfile: gemfiles/rails_5_no_sprockets.gemfile
63+
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
64+
- rvm: jruby-9.1.9.0
65+
gemfile: gemfiles/rails_5.2_sprockets_4.gemfile
4566

4667
allow_failures:
4768
- rvm: jruby-9.1.9.0
69+
gemfile: gemfiles/rails_5.2_no_sprockets_webpacker_4.gemfile
70+
- rvm: jruby-9.1.9.0
71+
gemfile: gemfiles/rails_5.2_sprockets_4.gemfile
4872

4973
before_install:
5074
# Repo for Yarn

Appraisals

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ appraise 'rails-5.2-sprockets_4' do
44
gem 'turbolinks', '~> 5'
55
end
66

7+
appraise 'rails-5.2_no_sprockets_webpacker_3' do
8+
gem 'rails', '~> 5.2.0'
9+
gem 'webpacker', '~> 3.0'
10+
gem 'mini_racer', :platforms => :mri
11+
gem 'therubyrhino', :platforms => :jruby
12+
end
13+
14+
appraise 'rails-5.2_no_sprockets_webpacker_4' do
15+
gem 'rails', '~> 5.2.0'
16+
gem 'webpacker', '~> 4.0'
17+
gem 'mini_racer', :platforms => :mri
18+
gem 'therubyrhino', :platforms => :jruby
19+
end
20+
721
appraise 'rails-5.1-sprockets_4' do
822
gem 'rails', '~> 5.1.0'
923
gem 'sprockets', '~> 4.0.x'
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "rails", "~> 5.2.0"
6+
gem "webpacker", "~> 3.0"
7+
gem "mini_racer", platforms: :mri
8+
gem "therubyrhino", platforms: :jruby
9+
10+
gemspec path: "../"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "rails", "~> 5.2.0"
6+
gem "webpacker", "~> 4.0"
7+
gem "mini_racer", platforms: :mri
8+
gem "therubyrhino", platforms: :jruby
9+
10+
gemspec path: "../"

react-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
1515
1616

1717
s.add_development_dependency 'appraisal'
18-
s.add_development_dependency 'bundler', '>= 1.2.2'
18+
s.add_development_dependency 'bundler', '>= 1.2.2', '< 2.0'
1919
s.add_development_dependency 'codeclimate-test-reporter'
2020
s.add_development_dependency 'coffee-rails'
2121
s.add_development_dependency 'es5-shim-rails', '>= 2.0.5'

0 commit comments

Comments
 (0)