summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-01-25 10:59:10 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-01-25 10:59:10 -0800
commitf4c23b8d42b3fbf2a63c36f7e092ad4759a8960e (patch)
tree65c5184d4025097237a2f091dca47b11e38832ba /.travis.yml
parent991ab996ea66dfa63f79b7448deb980d60a0e330 (diff)
downloadchef-f4c23b8d42b3fbf2a63c36f7e092ad4759a8960e.tar.gz
allow uninstall of bundler to faillcg/uninstall-bundler-fails
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 2969849875..b9ebc22050 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ dist: trusty
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem --version
- - rvm @global do gem uninstall bundler -a -x
+ - rvm @global do gem uninstall bundler -a -x || true
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundle --version
- rm -f .bundle/config
@@ -334,7 +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
+ - rvm @global do gem uninstall bundler -a -x || true
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- sudo apt-get update
- sudo apt-get -y install squid3 git curl