Skip to content

Commit

Permalink
Merge pull request puppetlabs#136 from hunner/change_specs
Browse files Browse the repository at this point in the history
Update travis and bundler
  • Loading branch information
hunner committed Jul 1, 2013
2 parents 142b72b + c1c61c6 commit 0665a5d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
19 changes: 8 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@ script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
rvm:
- 1.8.7
- 1.9.3
- ruby-head
- 2.0.0
env:
- PUPPET_GEM_VERSION="~> 2.6.0"
- PUPPET_GEM_VERSION="~> 2.7.0"
- PUPPET_GEM_VERSION="~> 3.0.0"
- PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_GEM_VERSION="~> 3.2.0"
matrix:
exclude:
- rvm: ruby-head
env: PUPPET_GEM_VERSION="~> 3.0.0"
- rvm: ruby-head
env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: ruby-head
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.6.0"
- rvm: ruby-head
env: PUPPET_GEM_VERSION="~> 2.6.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.2.0"
notifications:
email: false
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
source :rubygems
source 'https://rubygems.org'

group :development, :test do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
end

Expand Down

0 comments on commit 0665a5d

Please sign in to comment.