summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2017-08-13 10:21:48 -0400
committerBryan McLellan <btm@loftninjas.org>2017-08-13 10:44:36 -0400
commit09071e8b50a9a0f02d8f5605376fdf824c9552d1 (patch)
tree3f423ed3a49b4abbfcd0733764a6ee3081bfe01f
parent74d6bc1313036727350c1f272534e0b62e4b6d3e (diff)
downloadchef-09071e8b50a9a0f02d8f5605376fdf824c9552d1.tar.gz
Don't `gem uninstall bundler` in Travis
Some of the Travis tests fail here if bundler isn't present. These lines were removed in master along with Ruby upgrades. Signed-off-by: Bryan McLellan <btm@loftninjas.org>
-rw-r--r--.travis.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 67f845bb3b..7a897b7f75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ cache: bundler
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem --version
- - gem uninstall bundler -a -x
- rvm @global do gem uninstall bundler -a -x
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundle --version
@@ -85,7 +84,6 @@ matrix:
# The chefspec tests + bundler cache + "gem update --system" interact badly :/
# (Cucumber doesn't start.)
before_install:
- - gem uninstall bundler -a -x
- rvm @global do gem uninstall bundler -a -x
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry