diff options
| author | tyler-ball <tball@chef.io> | 2018-08-06 13:38:19 -0600 |
|---|---|---|
| committer | tyler-ball <tball@chef.io> | 2018-08-06 13:38:19 -0600 |
| commit | 85daefb999ab6813ccc570ee0ff21b01e14dc8d8 (patch) | |
| tree | adf9c88046f50168c0b32ba2d8e5077fd5e2bc87 | |
| parent | 3a5f21249c3e2560b73d5881ca7ab3e8ddb24dac (diff) | |
| download | chef-85daefb999ab6813ccc570ee0ff21b01e14dc8d8.tar.gz | |
Also pulling in https://github.com/chef/chef/pull/6789 to fix travis
Signed-off-by: tyler-ball <tball@chef.io>
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 07395448ee..3960749218 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 |