Skip to content

Commit e4082e4

Browse files
committed
add conditional logic to puppet version used
1 parent 7e056df commit e4082e4

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

octocatalog-diff.gemspec

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,28 @@ EOF
2929
s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
3030
s.add_runtime_dependency 'parallel', '>= 1.12.0'
3131
s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
32+
if puppet_version == "4.10.10"
33+
s.add_runtime_dependency 'puppet', '4.10.10'
34+
s.add_development_dependency 'puppet', '4.10.10'
35+
elsif puppet_version == "5.5.22"
36+
s.add_runtime_dependency 'puppet', '5.5.22'
37+
s.add_development_dependency 'puppet', '5.5.22'
38+
elsif puppet_version == "6.18.0"
39+
s.add_runtime_dependency 'puppet', '6.18.0'
40+
s.add_development_dependency 'puppet', '6.18.0'
41+
elsif puppet_version == "7.3.0"
42+
s.add_runtime_dependency 'puppet', '7.3.0'
43+
s.add_development_dependency 'puppet', '7.3.0'
44+
end
3245

3346
s.add_development_dependency 'rspec', '~> 3.4.0'
3447
s.add_development_dependency 'rake', '12.3.3'
3548
s.add_development_dependency 'parallel_tests', '2.7.1'
3649
s.add_development_dependency 'rspec-retry', '0.5.0'
37-
3850
s.add_development_dependency 'rubocop', '= 0.49.0'
39-
4051
s.add_development_dependency 'simplecov', '~> 0.14.1'
4152
s.add_development_dependency 'simplecov-erb', '~> 0.1.1'
4253

43-
puppet_version = ENV['PUPPET_VERSION'] || DEFAULT_PUPPET_VERSION
44-
s.add_development_dependency 'puppet', "~> #{puppet_version}"
45-
4654
puppet_v = Gem::Version.new(puppet_version)
4755
version_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), 'config', 'puppet-versions.json')))
4856
version_config.each do |data|

0 commit comments

Comments
 (0)