summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2018-01-23 12:49:54 +0000
committerGitHub <noreply@github.com>2018-01-23 12:49:54 +0000
commit3917f01a53244f33c635c195622d0451b2b61076 (patch)
tree3f2b22ad201eb3c88b48206d043653ff11a1231b
parentbc98db2fd24d75443d048a83ae1844eec7499507 (diff)
parent7d595bbd56ee19a6497f4946b39853e6ad0b3c12 (diff)
downloadchef-3917f01a53244f33c635c195622d0451b2b61076.tar.gz
Merge pull request #6769 from chef/tm/proxy_tests
Fix proxy tests with ruby 2.5
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 80695c09e3..2969849875 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -334,6 +334,7 @@ matrix:
sudo: required
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+ - rvm @global do gem uninstall bundler -a -x
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- sudo apt-get update
- sudo apt-get -y install squid3 git curl