RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Ensure right Puppet version in place for Travis

Browse Source 
Keep PUPPET_VERSION for any existing uses, use PUPPET_GEM_VERSION for the
version spec that is supplied via .travis.yml.
This commit is contained in:
Brett Porter
2013-08-02 07:38:03 +10:00
parent a94f5195e0
commit 1f071f1b96
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -2,6 +2,8 @@ source "http://rubygems.org"
if ENV.key?('PUPPET_VERSION') if ENV.key?('PUPPET_VERSION')
puppetversion = "= #{ENV['PUPPET_VERSION']}" puppetversion = "= #{ENV['PUPPET_VERSION']}"
elsif ENV.key?('PUPPET_GEM_VERSION')
puppetversion = ENV['PUPPET_GEM_VERSION']
else else
puppetversion = ['~> 2.7'] puppetversion = ['~> 2.7']
end end

14
Gemfile.lock
View File

@@ -2,12 +2,17 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
diff-lcs (1.2.2) diff-lcs (1.2.2)
facter (1.6.18) facter (1.7.2)
hiera (1.2.1)
json_pure
json_pure (1.8.0)
metaclass (0.0.1) metaclass (0.0.1)
mocha (0.13.3) mocha (0.13.3)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
puppet (2.7.21) puppet (3.2.3)
facter (~> 1.5) facter (~> 1.6)
hiera (~> 1.0)
rgen (~> 0.6.5)
puppet-lint (0.3.2) puppet-lint (0.3.2)
puppetlabs_spec_helper (0.4.1) puppetlabs_spec_helper (0.4.1)
mocha (>= 0.10.5) mocha (>= 0.10.5)
@@ -15,6 +20,7 @@ GEM
rspec (>= 2.9.0) rspec (>= 2.9.0)
rspec-puppet (>= 0.1.1) rspec-puppet (>= 0.1.1)
rake (10.0.4) rake (10.0.4)
rgen (0.6.5)
rspec (2.13.0) rspec (2.13.0)
rspec-core (~> 2.13.0) rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0) rspec-expectations (~> 2.13.0)
@@ -30,7 +36,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
puppet (~> 2.7) puppet (~> 3.2.0)
puppet-lint puppet-lint
puppetlabs_spec_helper puppetlabs_spec_helper
rake rake