Skip to content

Commit 17d0e6b

Browse files
authored
Merge pull request #2300 from cookpad/c/travis-fixes-master
Updates to travis integration
2 parents bc4805c + b76aae7 commit 17d0e6b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,21 @@ env:
2121
- "RAILS_VERSION=4.2"
2222
- "RAILS_VERSION=5.0"
2323
- "RAILS_VERSION=5.1"
24+
- "RAILS_VERSION=5.2"
2425
- "RAILS_VERSION=master"
2526

2627
rvm:
2728
- 2.1.10
2829
- 2.2.8
2930
- 2.3.5
3031
- 2.4.2
32+
- 2.5.3
3133
- ruby-head
3234

35+
branches:
36+
only:
37+
- 0-10-stable
38+
3339
matrix:
3440
include:
3541
- { rvm: jruby-9.1.13.0, jdk: oraclejdk8, env: "RAILS_VERSION=4.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
@@ -44,7 +50,9 @@ matrix:
4450
- { rvm: 2.3.5, env: RAILS_VERSION=master }
4551
- { rvm: 2.1.10, env: RAILS_VERSION=5.0 }
4652
- { rvm: 2.1.10, env: RAILS_VERSION=5.1 }
53+
- { rvm: 2.1.10, env: RAILS_VERSION=5.2 }
4754
- { rvm: 2.4.2, env: RAILS_VERSION=4.1 }
55+
- { rvm: 2.5.3, env: RAILS_VERSION=4.1 }
4856
- { rvm: ruby-head, env: RAILS_VERSION=4.1 }
4957
allow_failures:
5058
- rvm: ruby-head

0 commit comments

Comments
 (0)