diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-01-24 00:23:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 00:23:16 -0800 |
| commit | ce30c4c1e008de6b9b385ebbe9bd4ab5331cb8cf (patch) | |
| tree | 083a7bee90b406b1f539f9dc1442c77758e09328 | |
| parent | ec1c764db7a9019b1a0afe6afbecd93cb2cf93f4 (diff) | |
| parent | a11c1a7b7cfd80757e8dc05d1348be3168174ee9 (diff) | |
| download | chef-ce30c4c1e008de6b9b385ebbe9bd4ab5331cb8cf.tar.gz | |
Merge pull request #5754 from chef/lcg/fix-travis
fix the bundler pinning
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 5460516710..ed7fffc22b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,11 @@ cache: bundler # Early warning system to catch if Rubygems breaks something 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 - rm -f .bundle/config bundler_args: --without changelog development docgen guard maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen @@ -81,6 +85,8 @@ 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 script: tasks/bin/run_external_test $TEST_GEM rake diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index be544badca..69af8dbd44 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,5 +1,5 @@ # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead. -override :rubygems, version: "2.6.8" +override :rubygems, version: "2.6.10" override :bundler, version: "1.12.5" override :rainbow, version: "2.1.0" override "libffi", version: "3.2.1" |