Skip to content

Commit 1ebdda3

Browse files
authored
Merge pull request #2328 from rails-api/rails-6-rc
Add support for Rails 6.0.0.rc1 on Travis
2 parents 19a6188 + 0f75837 commit 1ebdda3

File tree

1 file changed

+49
-18
lines changed

1 file changed

+49
-18
lines changed

.travis.yml

Lines changed: 49 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,21 @@ ruby_supported_versions:
1010
- &ruby_2_6 2.6.3
1111
- &ruby_head ruby-head
1212

13+
rails_supported_versions:
14+
- &rails_4_1 RAILS_VERSION=4.1
15+
- &rails_4_2 RAILS_VERSION=4.2
16+
- &rails_5_0 RAILS_VERSION=5.0
17+
- &rails_5_1 RAILS_VERSION=5.1
18+
- &rails_5_2 RAILS_VERSION=5.2
19+
- &rails_6_0_0_rc1 RAILS_VERSION=6.0.0.rc1
20+
- &rails_master RAILS_VERSION=master
21+
1322
cache:
1423
directories:
1524
- vendor/bundle
1625

1726
before_install:
18-
- "travis_retry gem update --system 2.7.8"
27+
- "travis_retry gem update --system 2.7.9"
1928
- "travis_retry gem install bundler -v '1.17.3'"
2029
install: BUNDLER_VERSION=1.17.3 bundle install --path=vendor/bundle --retry=3 --jobs=3
2130

@@ -26,12 +35,13 @@ after_success:
2635

2736
env:
2837
matrix:
29-
- "RAILS_VERSION=4.1"
30-
- "RAILS_VERSION=4.2"
31-
- "RAILS_VERSION=5.0"
32-
- "RAILS_VERSION=5.1"
33-
- "RAILS_VERSION=5.2"
34-
- "RAILS_VERSION=master"
38+
- *rails_4_1
39+
- *rails_4_2
40+
- *rails_5_0
41+
- *rails_5_1
42+
- *rails_5_2
43+
- *rails_6_0_0_rc1
44+
- *rails_master
3545

3646
rvm:
3747
- *ruby_2_1
@@ -54,19 +64,40 @@ matrix:
5464
# - { rvm: jruby-9.1.13.0, jdk: oraclejdk8, env: "RAILS_VERSION=5.0 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
5565
# - { rvm: jruby-head, jdk: oraclejdk8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
5666
exclude:
57-
- { rvm: *ruby_2_4, env: RAILS_VERSION=master }
58-
- { rvm: *ruby_2_3, env: RAILS_VERSION=master }
59-
- { rvm: *ruby_2_2, env: RAILS_VERSION=master }
60-
- { rvm: *ruby_2_1, env: RAILS_VERSION=master }
61-
- { rvm: *ruby_2_1, env: RAILS_VERSION=5.2 }
62-
- { rvm: *ruby_2_1, env: RAILS_VERSION=5.1 }
63-
- { rvm: *ruby_2_1, env: RAILS_VERSION=5.0 }
64-
- { rvm: *ruby_head, env: RAILS_VERSION=4.1 }
65-
- { rvm: *ruby_2_6, env: RAILS_VERSION=4.1 }
66-
- { rvm: *ruby_2_5, env: RAILS_VERSION=4.1 }
67-
- { rvm: *ruby_2_4, env: RAILS_VERSION=4.1 }
67+
- { rvm: *ruby_2_1, env: *rails_5_0 }
68+
- { rvm: *ruby_2_1, env: *rails_5_1 }
69+
- { rvm: *ruby_2_1, env: *rails_5_2 }
70+
71+
- { rvm: *ruby_2_1, env: *rails_6_0_0_rc1 }
72+
- { rvm: *ruby_2_2, env: *rails_6_0_0_rc1 }
73+
- { rvm: *ruby_2_3, env: *rails_6_0_0_rc1 }
74+
- { rvm: *ruby_2_4, env: *rails_6_0_0_rc1 }
75+
76+
- { rvm: *ruby_2_1, env: *rails_master }
77+
- { rvm: *ruby_2_2, env: *rails_master }
78+
- { rvm: *ruby_2_3, env: *rails_master }
79+
- { rvm: *ruby_2_4, env: *rails_master }
80+
6881
allow_failures:
82+
- { rvm: *ruby_2_4, env: *rails_4_1 }
83+
- { rvm: *ruby_2_5, env: *rails_4_1 }
84+
- { rvm: *ruby_2_6, env: *rails_4_1 }
85+
86+
# allow RAILS_VERSION=master to fail against ruby 2.5+ until this gem supports RAILS_VERSION
87+
# https://github.com/rails/rails/blob/master/RAILS_VERSION
88+
# https://github.com/rails-api/active_model_serializers/blob/0-10-stable/active_model_serializers.gemspec#L24
89+
- { rvm: *ruby_2_5, env: *rails_master }
90+
- { rvm: *ruby_2_6, env: *rails_master }
91+
6992
- rvm: *ruby_head
93+
# - { rvm: *ruby_head, env: *rails_4_1 }
94+
# - { rvm: *ruby_head, env: *rails_4_2 }
95+
# - { rvm: *ruby_head, env: *rails_5_0 }
96+
# - { rvm: *ruby_head, env: *rails_5_1 }
97+
# - { rvm: *ruby_head, env: *rails_5_2 }
98+
# - { rvm: *ruby_head, env: *rails_6_0_0_rc1 }
99+
# - { rvm: *ruby_head, env: *rails_master }
100+
70101
- rvm: jruby-head
71102
# See JRuby currently failing on Rails 5+ https://github.com/jruby/activerecord-jdbc-adapter/issues/708
72103
- { rvm: jruby-9.1.13.0, jdk: oraclejdk8, env: "RAILS_VERSION=5.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }

0 commit comments

Comments
 (0)