summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-03-29 20:58:29 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-03-29 20:58:29 -0700
commit95fb9d69a4e04df22775907bd31fd4df5818fec7 (patch)
tree5c5f9bdfac103d83e9833477017ab1d493d87631
parent5379c192c70b32a2c9a1fa9debedd26a4c1b98e3 (diff)
parent736d62fe49c6ac00c0acdd703f848b787c6398de (diff)
downloadchef-95fb9d69a4e04df22775907bd31fd4df5818fec7.tar.gz
Merge pull request #4766 from chef/lcg/travis-ruby-2.3.0
add ruby-2.3.0 to travis matrix
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index e0edc70411..b3321813a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,9 @@ matrix:
- rvm: 2.2
sudo: true
bundler_args: --without server docgen maintenance
+ - rvm: 2.3.0
+ sudo: true
+ bundler_args: --without server docgen maintenance
- rvm: rbx
sudo: true
bundler_args: --without server docgen maintenance ruby_prof pry
@@ -146,6 +149,7 @@ matrix:
- sudo cat /var/log/squid3/access.log
allow_failures:
+ - rvm: 2.3.0
- rvm: rbx
- rvm: 2.2
env: "GEMFILE_MOD=\"gem 'halite', github: 'poise/halite'\""