diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-01-25 11:22:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-25 11:22:04 -0800 |
| commit | a0ef0dc784bc559efa66bf26ad5fea49204a0959 (patch) | |
| tree | d7e367686f5932192aa0e00c960fc1990bb12ecb | |
| parent | 991ab996ea66dfa63f79b7448deb980d60a0e330 (diff) | |
| parent | 12ea8acd29cf92bba84e2cb69874778c2511d7ef (diff) | |
| download | chef-a0ef0dc784bc559efa66bf26ad5fea49204a0959.tar.gz | |
Merge pull request #6789 from chef/lcg/uninstall-bundler-fails
allow uninstall of bundler to fail
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2969849875..2911dcc70d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,10 @@ 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 + # travis may preinstall a bundler gem which is later than the one which we pin, which may totally hose us, so we preemtively + # uninstall anything they may have installed here. if they haven't installed anything then we have to ignore the failure + # to uninstall the default bundler that ships embedded in ruby itself. + - 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 +337,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 |