diff options
| author | Tim Smith <tsmith@chef.io> | 2017-01-24 12:35:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 12:35:15 -0800 |
| commit | 3e27195210c8ee77114c4b6c39f56be1d91f42a4 (patch) | |
| tree | 3f17933f98001c5d0152ea1ea639601b95566b67 | |
| parent | 7254fff3cbcc4ea489259c7d7a86e9c317148bdf (diff) | |
| parent | 30088e67a5449e8a96e978442852dd41f346afea (diff) | |
| download | ohai-3e27195210c8ee77114c4b6c39f56be1d91f42a4.tar.gz | |
Merge pull request #946 from chef/fix_travis
Update travis/appveyer preinstall to resolve rainbow failures
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | ohai.gemspec | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index ed14dd13..b2a601c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,16 @@ sudo: false branches: only: - master + - 8-stable before_install: - gem update --system + - gem --version + - gem uninstall bundler -a -x -I + - rvm @global do gem uninstall bundler -a -x -I - gem install bundler - bundle --version - - gem --version + - rm -f .bundle/config rvm: - 2.2.6 - 2.3.3 diff --git a/appveyor.yml b/appveyor.yml index 06ceaa7d..d7f753b0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,9 @@ install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - echo %PATH% - ruby --version + - gem update --system - gem --version + - gem uninstall bundler -a -x -I - gem install bundler --quiet --no-ri --no-rdoc - bundler --version diff --git a/ohai.gemspec b/ohai.gemspec index 17dedee1..58bbee84 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -25,15 +25,11 @@ Gem::Specification.new do |s| s.add_dependency "ipaddress" s.add_dependency "wmi-lite", "~> 1.0" s.add_dependency "ffi", "~> 1.9" + s.add_dependency "chef-config", ">= 12.5.0.alpha.1", "< 14" # Note for ohai developers: If chef-config causes you grief, try: # bundle install --with development # this should work as long as chef is a development dependency in Gemfile. # - # Chef depends on ohai and chef-config. Ohai depends on chef-config. The - # version of chef-config that chef depends on is whatver version chef - # happens to be on master. This will need to be updated again once work on - # Chef 13 starts, otherwise builds will break. - s.add_dependency "chef-config", ">= 12.5.0.alpha.1", "< 13" s.bindir = "bin" s.executables = %w{ohai} |