Skip to content

Commit bf6224b

Browse files
committed
💚 Correct travis
1 parent 3a30d23 commit bf6224b

6 files changed

+13
-59
lines changed

.travis.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cache:
77
bundler: true
88
yarn: true
99
rvm:
10-
- 2.3.0
10+
- 2.4.2
1111
- 2.1
1212
- jruby-9.1.9.0
1313

@@ -21,7 +21,7 @@ gemfile:
2121
# These don't have webpacker:
2222
- gemfiles/rails_3.2.gemfile
2323
- gemfiles/rails_4.0.5.gemfile
24-
- gemfiles/rails_4.0_with_therubyracer.gemfile
24+
- gemfiles/rails_4.0_with_mini_racer.gemfile
2525
- gemfiles/rails_4.1.gemfile
2626
- gemfiles/rails_4.2_sprockets_2.gemfile
2727
- gemfiles/rails_4.2_sprockets_3.gemfile
@@ -31,12 +31,13 @@ gemfile:
3131
matrix:
3232
fast_finish: true
3333
exclude:
34+
# all except rails_4.1 skipped on 2.1
3435
- rvm: 2.1
3536
gemfile: gemfiles/rails_3.2.gemfile
3637
- rvm: 2.1
3738
gemfile: gemfiles/rails_4.0.5.gemfile
3839
- rvm: 2.1
39-
gemfile: gemfiles/rails_4.0_with_therubyracer.gemfile
40+
gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
4041
- rvm: 2.1
4142
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
4243
- rvm: 2.1
@@ -55,22 +56,23 @@ matrix:
5556
gemfile: gemfiles/rails_5_no_sprockets.gemfile
5657
- rvm: 2.1
5758
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
59+
# all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3, and 3.2 skipped on jruby
5860
- rvm: jruby-9.1.9.0
59-
gemfile: gemfiles/rails_4.0.gemfile
60-
- rvm: jruby-9.1.9.0
61-
gemfile: rails_4.0_with_therubyracer.gemfile
62-
- rvm: jruby-9.1.9.0
63-
gemfile: gemfiles/rails_4.1.gemfile
64-
- rvm: jruby-9.1.9.0
65-
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
61+
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
6662
- rvm: jruby-9.1.9.0
6763
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
6864
- rvm: jruby-9.1.9.0
6965
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
7066
- rvm: jruby-9.1.9.0
7167
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
7268
- rvm: jruby-9.1.9.0
73-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
69+
gemfile: gemfiles/rails_4.0.5.gemfile
70+
- rvm: jruby-9.1.9.0
71+
gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
72+
- rvm: jruby-9.1.9.0
73+
gemfile: gemfiles/rails_4.1.gemfile
74+
- rvm: jruby-9.1.9.0
75+
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
7476
- rvm: jruby-9.1.9.0
7577
gemfile: gemfiles/rails_5_no_sprockets.gemfile
7678

gemfiles/rails_4.0_with_therubyracer.gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

gemfiles/rails_5_webpacker_1_1.gemfile

Lines changed: 0 additions & 9 deletions
This file was deleted.

gemfiles/rails_5_webpacker_1_x.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

gemfiles/rails_5_webpacker_2.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

gemfiles/rails_5_webpacker_3.gemfile

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)