diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2013-02-25 14:19:13 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-02-25 14:19:13 -0800 |
| commit | 9a06f11b11c96fff20a2e62c69a29684d943b773 (patch) | |
| tree | 6c523fd16a2f9f6bbcb87109fabc17e3c9e79f17 /.travis.yml | |
| parent | 5b81c26d94eb763eeb044b484a22b56f71c0cd5e (diff) | |
| parent | e0a2dc5b918482a5c05c0d7a6647f4e8a537616f (diff) | |
Merge branch '4.x'
* 4.x:
(maint) Add Ruby 2.0.0 to Travis build matrix
Conflicts:
.gitignore
.travis.yml
Gemfile
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index df58d5a..1bb1889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,19 @@ language: ruby bundler_args: --without development -script: "bundle exec rake spec SPEC_OPTS='--format documentation'" +script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'" rvm: - - 1.9.3 - 1.8.7 + - 1.9.3 + - 2.0.0 - ruby-head env: - - PUPPET_GEM_VERSION="~> 2.7" - PUPPET_GEM_VERSION=">= 3.0.0" matrix: allow_failures: + - rvm: 2.0.0 - rvm: ruby-head - exclude: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.7" - - rvm: ruby-head + include: + - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 2.7" notifications: email: false |