summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-12-14 13:44:10 -0800
committerGitHub <noreply@github.com>2016-12-14 13:44:10 -0800
commit32cf6385c6e87a3679a47ab5909557b570a075c3 (patch)
tree4e1e7acddced17134e137edabf2c22a6c520e29f
parent89a632571696b53688e86490ceeec77ca00a3197 (diff)
parentcf4d58911befa7be537eb9c40d2a13fb16e52874 (diff)
downloadchef-32cf6385c6e87a3679a47ab5909557b570a075c3.tar.gz
Merge pull request #5647 from chef/ruby24
Swap rbx testing in Travis for Ruby head
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b08ec2d049..065e03bc07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ matrix:
script: sudo -E $(which bundle) exec rake spec;
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- - rvm: rbx
+ - rvm: ruby-head
sudo: true
script: sudo -E $(which bundle) exec rake spec;
# also remove integration / external tests
@@ -329,7 +329,7 @@ matrix:
- sudo cat /var/log/squid3/access.log
allow_failures:
- - rvm: rbx
+ - rvm: ruby-head
notifications:
on_change: true