diff options
| author | Aaron Stone <aaron@serendipity.cx> | 2013-07-25 13:49:27 -0700 |
|---|---|---|
| committer | Aaron Stone <aaron@serendipity.cx> | 2013-07-25 13:49:27 -0700 |
| commit | 45cb7c1319e79cbfb3ff2bcdadfc275260d557e0 (patch) | |
| tree | 0cb104d45847205a8a6a17138071d34aef597030 | |
| parent | 164cadc9b9ac25ce70885100f28f8cd649358fa4 (diff) | |
| parent | 1841d11ee3f885c902a4d41b94beee141a468fa2 (diff) | |
| download | puppet-vcsrepo-45cb7c1319e79cbfb3ff2bcdadfc275260d557e0.tar.gz puppet-vcsrepo-45cb7c1319e79cbfb3ff2bcdadfc275260d557e0.tar.bz2 | |
Merge pull request #85 from sodabrew/travis_puppet_version
Try to get Travis to respect the three different puppet versions
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 20 |
3 files changed, 13 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml index f349b8d..5e3f744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,21 +5,30 @@ branches: notifications: email: false language: ruby -script: 'bundle exec rake spec' +script: +- 'bundle exec gem list' +- 'bundle exec rake spec' after_success: - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng - .forge-releng/publish rvm: - 1.8.7 - 1.9.3 +- 2.0.0 env: matrix: - PUPPET_VERSION=2.6.18 - - PUPPET_VERSION=2.7.21 - - PUPPET_VERSION=3.1.1 + - PUPPET_VERSION=2.7.22 + - PUPPET_VERSION=3.2.1 global: - PUBLISHER_LOGIN=puppetlabs - secure: |- ZiIkYd9+CdPzpwSjFPnVkCx1FIlipxpbdyD33q94h2Tj5zXjNb1GXizVy0NR kVxGhU5Ld8y9z8DTqKRgCI1Yymg3H//OU++PKLOQj/X5juWVR4URBNPeBOzu IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c= +matrix: + exclude: + - rvm: 1.9.3 + env: PUPPET_VERSION=2.6.18 + - rvm: 2.0.0 + env: PUPPET_VERSION=2.6.18 @@ -2,4 +2,4 @@ source 'https://rubygems.org' gem 'rake', '~> 0.8.7' gem 'rspec', '~> 1.3' gem 'mocha', '~> 0.12.9', :require => false -gem 'puppet', '~> 2.7' +gem 'puppet', "~> #{ENV['PUPPET_VERSION'] || '2.7.22'}" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index ce22804..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,20 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - facter (1.7.2) - metaclass (0.0.1) - mocha (0.12.10) - metaclass (~> 0.0.1) - puppet (2.7.22) - facter (~> 1.5) - rake (0.8.7) - rspec (1.3.2) - -PLATFORMS - ruby - -DEPENDENCIES - mocha (~> 0.12.9) - puppet (~> 2.7) - rake (~> 0.8.7) - rspec (~> 1.3) |