Skip to content

Commit 0ef8c96

Browse files
authored
Merge pull request #275 from github/jhongturney/dependabot-puppet-bumps
Fix dependabot issues on declared puppet versions
2 parents fdb7e83 + 2fbb921 commit 0ef8c96

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

config/puppet-versions.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
[
2-
{
3-
"minimum_version": "3.0.0",
4-
"maximum_version": "3.99.99",
5-
"additional_gems": [
6-
{ "name": "safe_yaml", "version": "~> 1.0.4" },
7-
{ "name": "puppetdb-terminus", "version": "3.2.4" }
8-
]
9-
},
102
{
113
"minimum_version": "4.0.0",
124
"maximum_version": "4.99.99",

octocatalog-diff.gemspec

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,8 @@ EOF
3030
s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
3131
s.add_runtime_dependency 'parallel', '>= 1.12.0'
3232
s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
33-
if puppet_version == '4.10.10'
34-
s.add_runtime_dependency 'puppet', '4.10.10'
35-
s.add_development_dependency 'puppet', '4.10.10'
36-
elsif puppet_version == '5.5.22'
37-
s.add_runtime_dependency 'puppet', '5.5.22'
38-
s.add_development_dependency 'puppet', '5.5.22'
39-
elsif puppet_version == '6.18.0'
40-
s.add_runtime_dependency 'puppet', '6.18.0'
41-
s.add_development_dependency 'puppet', '6.18.0'
42-
elsif puppet_version == '7.3.0'
43-
s.add_runtime_dependency 'puppet', '7.3.0'
44-
s.add_development_dependency 'puppet', '7.3.0'
45-
end
46-
33+
s.add_runtime_dependency 'puppet', puppet_version
34+
s.add_development_dependency 'puppet', puppet_version
4735
s.add_development_dependency 'rspec', '~> 3.4.0'
4836
s.add_development_dependency 'rake', '12.3.3'
4937
s.add_development_dependency 'parallel_tests', '2.7.1'

0 commit comments

Comments
 (0)