diff options
author | Eli Young <elyscape@gmail.com> | 2015-02-12 11:43:34 -0800 |
---|---|---|
committer | Eli Young <elyscape@gmail.com> | 2015-02-12 11:45:39 -0800 |
commit | f9855d99ec117d336aa3860e2118f29ddfd10c35 (patch) | |
tree | 37247e2b5623dbd2738d50112d5c8304b7f0c311 /Gemfile | |
parent | 8524a17e0f51a36c6c7b518bb41f8bb80c2c96dd (diff) |
Have Travis actually test Facter 1.6/1.7
The Gemfile didn't actually specify which version to use for Facter,
even when there was an environment variable to that effect.
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -25,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 |