diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-05-02 17:56:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 17:56:14 -0500 |
| commit | b2abfa294eb51775885657230b6a32485d2634f1 (patch) | |
| tree | a65307e5b4568ea88e851cef0657bf345bf0acc8 | |
| parent | 425e8ac704ec2bc12f8377b71c00acc4d3404b0c (diff) | |
| parent | 0f25cb6827973980b30c5c99aefc2e2cc10b0393 (diff) | |
| download | chef-b2abfa294eb51775885657230b6a32485d2634f1.tar.gz | |
Merge pull request #6114 from chef/lcg/kitchen-test-current
switch to using trusty on travis
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 04789cb0a4..4fa9b65431 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: ruby sudo: false cache: bundler +dist: trusty # 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 @@ -274,7 +274,6 @@ matrix: # ### END TEST KITCHEN ONLY ### - rvm: 2.4.1 sudo: required - dist: trusty before_install: - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) |