Skip to content

Commit 8bc1d62

Browse files
committed
(CAT-2247) Remove support for Puppet 7 and Ruby 2.7
- Set ruby version for Puppet 8 from 3.2.0 to 3.1.0
1 parent 4d02e1b commit 8bc1d62

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

configs/components/_template_helper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def build_module(settings, pdk_bin, cachedir, privatedir, template_ref, is_windo
3131

3232
# Copy generated Gemfile.lock into cachedir.
3333
build_commands << "cp #{mod_name}/Gemfile.lock #{cachedir}/Gemfile-#{settings[:ruby_version]}.lock"
34-
build_commands << "cp #{mod_name}/Gemfile.lock #{cachedir}/Gemfile.lock" if settings[:rub_api] == '3.2.0'
34+
build_commands << "cp #{mod_name}/Gemfile.lock #{cachedir}/Gemfile.lock" if settings[:rub_api] == '3.1.0'
3535

3636
# Run 'bundle install' in the generated module to cache the gems
3737
# inside the project cachedir.

configs/components/gem-prune.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
gem_bins[local_settings[:ruby_api]] = local_settings[:host_gem]
1818
end
1919

20-
pdk_ruby_versions = ['2.7.0', '3.2.0']
20+
pdk_ruby_versions = ['3.1.0']
2121

2222
pdk_ruby_versions.map do |rubyapi|
2323
gem_paths = [

configs/components/puppet-versions.rb

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ def latest_puppet_gem(req)
3434
def ruby_for_puppet(version)
3535
# TODO: calculate this based on settings
3636
ruby_mappings = {
37-
'2.7.0' => Gem::Requirement.create(['~> 7.0']),
38-
'3.2.0' => Gem::Requirement.create(['~> 8.0'])
37+
'3.1.0' => Gem::Requirement.create(['~> 8.0'])
3938
}
4039

4140
ruby_mappings.each do |rubyver, pup_range|

0 commit comments

Comments
 (0)