Skip to content

Commit afc83ea

Browse files
committed
Merge pull request #411 from elyscape/fix/travis_build_issues
Fix Travis builds
2 parents 5863ab3 + f9855d9 commit afc83ea

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Gemfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ end
1212

1313
group :development, :unit_tests do
1414
gem 'rake', '~> 10.1.0', :require => false
15+
gem 'rspec', '~> 3.1.0', :require => false
1516
gem 'rspec-puppet', :require => false
1617
gem 'puppetlabs_spec_helper', :require => false
1718
gem 'puppet-lint', :require => false
@@ -24,8 +25,14 @@ group :system_tests do
2425
gem 'serverspec', :require => false
2526
end
2627

27-
ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
28-
puppetversion = ENV['GEM_PUPPET_VERSION']
28+
facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
29+
if facterversion
30+
gem 'facter', *location_for(facterversion)
31+
else
32+
gem 'facter', :require => false
33+
end
34+
35+
puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
2936
if puppetversion
3037
gem 'puppet', *location_for(puppetversion)
3138
else

0 commit comments

Comments
 (0)