diff options
| author | Claire McQuin <claire@getchef.com> | 2014-12-08 16:18:26 -0800 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-12-08 16:18:26 -0800 |
| commit | 0c285f221e2139c98a7ad5ef0fa95005305df430 (patch) | |
| tree | 2b3a33913265a672813966f0a2708793901a960f /.travis.yml | |
| parent | ac166598eb9a96b61e5a997b3a1c267579d174af (diff) | |
| parent | c6e5654a18f236dd75bb59472e80887c27310d99 (diff) | |
| download | chef-0c285f221e2139c98a7ad5ef0fa95005305df430.tar.gz | |
Merge branch 'audit-mode' of github.com:opscode/chef into mcquin/audit_event_proxy_specmcquin/audit_event_proxy_spec
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 3a81eb8881..e9e7c2cdc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,6 @@ -# Temporary workaround for issue with rubygems 2.2.0 with bundler 1.5 on ruby -# 1.8.7. -# -# A fix has been merged to rubygems but not yet released. See: -# https://github.com/rubygems/rubygems/commit/f8e0f1d5f67cfc4e1966cc1e2db367aebf8a09e4 -# -# See also CHEF-4916 -# -# This workaround should be removed when that fix is released. +# Early warning system to catch if Rubygems breaks something before_install: -- gem update --system 2.1.11 -- gem --version + gem update --system branches: only: @@ -35,14 +26,13 @@ env: matrix: include: - - rvm: 1.9.3 - rvm: 2.0.0 - - rvm: 2.1.1 - - rvm: 2.1.1 + - rvm: 2.1.5 + - rvm: 2.1.5 gemfile: pedant.gemfile script: bundle exec rake pedant ### START TEST KITCHEN ONLY ### - - rvm: 2.1.1 + - rvm: 2.1.5 gemfile: kitchen-tests/Gemfile before_install: - echo -n $DO_KEY_CHUNK_{0..30} >> ~/.ssh/id_aws.base64 |