diff options
author | Colleen Murphy <colleen@puppetlabs.com> | 2014-06-27 10:55:29 -0700 |
---|---|---|
committer | Colleen Murphy <colleen@puppetlabs.com> | 2014-06-27 10:55:29 -0700 |
commit | 8bbde47ae3c3917cf313fed3f94f4dcd5192b41e (patch) | |
tree | b2b48bbe9e7342fbde81671d7719b7312a2bedb0 | |
parent | b56654d263e4a613e6dc5ae1b99c81cc4f3b643b (diff) |
Synchronize .travis.yml
-rw-r--r-- | .travis.yml | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index ef2a36e..c72d5e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +1,17 @@ --- -branches: - only: - - master language: ruby bundler_args: --without development script: "bundle exec rake spec SPEC_OPTS='--format documentation'" -rvm: - - 1.8.7 - - 1.9.3 - - 2.0.0 -env: - matrix: - - PUPPET_GEM_VERSION="~> 2.7.0" - - PUPPET_GEM_VERSION="~> 3.3.0" matrix: fast_finish: true - exclude: + include: + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 2.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 2.7.0" + env: PUPPET_GEM_VERSION="~> 3.0" notifications: email: false -after_success: -- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release -- .forge-release/publish -before_install: -- gem update --system 2.1.11 -- gem --version -comments: -- Temporary workaround for broken Rubygems on Travis - |