Skip to content

Commit

Permalink
Merge pull request #411 from elyscape/fix/travis_build_issues
Browse files Browse the repository at this point in the history
Fix Travis builds
  • Loading branch information
cmurphy committed Feb 12, 2015
2 parents 5863ab3 + f9855d9 commit afc83ea
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ end

group :development, :unit_tests do
gem 'rake', '~> 10.1.0', :require => false
gem 'rspec', '~> 3.1.0', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
Expand All @@ -24,8 +25,14 @@ group :system_tests do
gem 'serverspec', :require => false
end

ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
puppetversion = ENV['GEM_PUPPET_VERSION']
facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
if facterversion
gem 'facter', *location_for(facterversion)
else
gem 'facter', :require => false
end

puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
if puppetversion
gem 'puppet', *location_for(puppetversion)
else
Expand Down

0 comments on commit afc83ea

Please sign in to comment.