Merge pull request #2300 from cookpad/c/travis-fixes-master

Updates to travis integration
This commit is contained in:
Benjamin Fleischer 2018-11-12 22:25:37 -06:00 committed by GitHub
commit 17d0e6bdb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,6 +21,7 @@ env:
- "RAILS_VERSION=4.2"
- "RAILS_VERSION=5.0"
- "RAILS_VERSION=5.1"
- "RAILS_VERSION=5.2"
- "RAILS_VERSION=master"
rvm:
@ -28,8 +29,13 @@ rvm:
- 2.2.8
- 2.3.5
- 2.4.2
- 2.5.3
- ruby-head
branches:
only:
- 0-10-stable
matrix:
include:
- { rvm: jruby-9.1.13.0, jdk: oraclejdk8, env: "RAILS_VERSION=4.1 JRUBY_OPTS='--dev -J-Xmx1024M --debug'" }
@ -44,7 +50,9 @@ matrix:
- { rvm: 2.3.5, env: RAILS_VERSION=master }
- { rvm: 2.1.10, env: RAILS_VERSION=5.0 }
- { rvm: 2.1.10, env: RAILS_VERSION=5.1 }
- { rvm: 2.1.10, env: RAILS_VERSION=5.2 }
- { rvm: 2.4.2, env: RAILS_VERSION=4.1 }
- { rvm: 2.5.3, env: RAILS_VERSION=4.1 }
- { rvm: ruby-head, env: RAILS_VERSION=4.1 }
allow_failures:
- rvm: ruby-head