Skip to content

Commit

Permalink
add future parser to travis matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoblitt committed Nov 18, 2014
1 parent 4c6a028 commit 8ac26ef
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@ rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1.4
env:
- PUPPET_GEM_VERSION="2.7.14"
- PUPPET_GEM_VERSION="~> 2.7"
- PUPPET_GEM_VERSION="~> 3.3"
- PUPPET_GEM_VERSION="~> 3.7" FUTURE_PARSER="yes"
matrix:
allow_failures:
- rvm: ruby-head
exclude:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="2.7.14"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="2.7.14"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7"
- rvm: 2.1.4
env: PUPPET_GEM_VERSION="~> 2.7"
fast_finish: true
notifications:
email: false
19 changes: 12 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ else
gem 'puppet', :require => false
end

gem 'rake', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'puppet-syntax', :require => false
gem 'rake', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'puppet-syntax', :require => false
# The patch needed to properly test the nsstools_add_cert() function
# https://github.com/rodjek/rspec-puppet/pull/155
# https://github.com/rodjek/rspec-puppet/commit/03e94422fb9bbdd950d5a0bec6ead5d76e06616b
gem 'rspec-puppet', '1.0.1', :git => 'https://github.com/rodjek/rspec-puppet.git', :ref => '03e94422fb9bbdd950d5a0bec6ead5d76e06616b', :require => false
# rspec 3 breaks rspec-puppet 1.0.1
gem 'rspec-core', '~> 2.0', :require => false
gem 'rspec-puppet',
:git => 'https://github.com/rodjek/rspec-puppet.git',
:ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
:require => false
# rspec 3 spews warnings with rspec-puppet 1.0.1
gem 'rspec-core', '~> 2.0', :require => false

# vim:ft=ruby

0 comments on commit 8ac26ef

Please sign in to comment.