diff options
| author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-30 12:08:22 -0700 |
|---|---|---|
| committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-30 12:08:22 -0700 |
| commit | f903790bbb9156855daab5a181233cfea9e8e5c8 (patch) | |
| tree | 01811d30a421a599a126b62425f113653efbc945 /.travis.yml | |
| parent | 56dd0c41f665a2b70bc2e3f97406386caf034b75 (diff) | |
| parent | 200ca342783c438a2b829fbd54c13739b1a197f2 (diff) | |
| download | puppet-vcsrepo-f903790bbb9156855daab5a181233cfea9e8e5c8.tar.gz puppet-vcsrepo-f903790bbb9156855daab5a181233cfea9e8e5c8.tar.bz2 | |
Merge pull request #185 from cmurphy/master
Synchronize .travis.yml
Diffstat (limited to '.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 - |