Skip to content

Commit

Permalink
gem updates and switch on ruby version
Browse files Browse the repository at this point in the history
  • Loading branch information
alex501212 committed Aug 16, 2024
1 parent c73c317 commit 44fe548
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 48 deletions.
4 changes: 2 additions & 2 deletions configs/components/rubygem-aws-partitions.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-aws-partitions" do |pkg, settings, platform|
pkg.version "1.962.0"
pkg.md5sum "41189f42dc83691fdfa8153e4dbf988d"
pkg.version "1.963.0"
pkg.md5sum "0d6e7affa0c506b848b23ba996977267"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-aws-sdk-core.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-aws-sdk-core" do |pkg, settings, platform|
pkg.version "3.201.3"
pkg.md5sum "4513d88fdfb723a7395290c3d54f9019"
pkg.version "3.201.4"
pkg.md5sum "3601b6fc8e1e45060c2f5dabb5d5f067"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-aws-sdk-ec2.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-aws-sdk-ec2" do |pkg, settings, platform|
pkg.version "1.467.0"
pkg.md5sum "4b8f90993610214036a661e2ed9506ac"
pkg.version "1.469.0"
pkg.md5sum "e9aac12389dbd547207f662cb1b1f05b"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-getoptlong.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-getoptlong' do |pkg, settings, platform|
pkg.version '0.2.0'
pkg.md5sum '91760bf343765c5d3f08cb5393d90487'
pkg.version '0.2.1'
pkg.md5sum 'ded8176bd043e45b082c05872fc513c3'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
15 changes: 5 additions & 10 deletions configs/components/rubygem-highline.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
component 'rubygem-highline' do |pkg, settings, _platform|
version = settings[:rubygem_highline_version] || '2.1.0'
pkg.version version

# leaving this at 3.0.1 for gem update on 12/08/2024 see https://github.com/puppetlabs/puppet-runtime/pull/888 for more info
case version
when '2.1.0'
pkg.md5sum '4209083bda845d47dcc05b7ab23f25fd'
when '3.0.1'
pkg.sha256sum 'ca18b218fd581b1fae832f89bfeaf2b34d3a93429c44fd4411042ffce286f009'
if settings[:ruby_version].to_f >= 3.2
pkg.version '3.1.0'
pkg.md5sum 'ab3fa9d21304bf9ee9403ffca3d653d0'
else
raise "rubygem-highline version #{version} has not been configured; Cannot continue."
pkg.version '2.1.0'
pkg.md5sum '4209083bda845d47dcc05b7ab23f25fd'
end

instance_eval File.read('configs/components/_base-rubygem.rb')
Expand Down
12 changes: 4 additions & 8 deletions configs/components/rubygem-nori.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
component 'rubygem-nori' do |pkg, settings, platform|
version = settings[:rubygem_nori_version] || '2.6.0'
pkg.version version

case version
when '2.6.0'
pkg.md5sum 'dc9c83026c10a3eb7093b9c8208c84f7'
when '2.7.1'
if settings[:ruby_version].to_f >= 3.2
pkg.version '2.7.1'
pkg.md5sum '83952a081b5e86d5aa62943ca9ccf312'
else
raise "rubygem-nori #{version} has not been configured; Cannot continue."
pkg.version '2.6.0'
pkg.md5sum 'dc9c83026c10a3eb7093b9c8208c84f7'
end

instance_eval File.read('configs/components/_base-rubygem.rb')
Expand Down
14 changes: 5 additions & 9 deletions configs/components/rubygem-public_suffix.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
component 'rubygem-public_suffix' do |pkg, _settings, _platform|
version = settings[:rubygem_public_suffix_version] || '5.1.1'
pkg.version version

case version
when '5.1.1'
pkg.md5sum '0895274ce1ffdadffcd979ced832b851'
when '6.0.1'
component 'rubygem-public_suffix' do |pkg, settings, platform|
if settings[:ruby_version].to_f >= 3.2
pkg.version '6.0.1'
pkg.md5sum '12ec93094a3467364c8c6ee5a6e8325a'
else
raise "rubygem-public_suffix #{version} has not been configured; Cannot continue."
pkg.version '5.1.1'
pkg.md5sum '0895274ce1ffdadffcd979ced832b851'
end

instance_eval File.read('configs/components/_base-rubygem.rb')
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-rexml.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-rexml' do |pkg, settings, platform|
pkg.version '3.3.4'
pkg.md5sum 'b7411377f3c1a9cbe65e862f74067f91'
pkg.version '3.3.5'
pkg.md5sum 'cdd5c83f1d7230a7d44406f69e9f3d2d'

# If the platform is solaris with sparc architecture in agent-runtime-7.x project, we want to gem install rexml
# ignoring the dependencies, this is because the pl-ruby version used in these platforms is ancient so it gets
Expand Down
12 changes: 4 additions & 8 deletions configs/components/rubygem-winrm.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
component 'rubygem-winrm' do |pkg, settings, platform|
version = settings[:rubygem_winrm_version] || '2.3.6'
pkg.version version

case version
when '2.3.6'
pkg.md5sum 'a99f8e81343f61caa441eb1397a1c6ae'
when '2.3.9'
if settings[:ruby_version].to_f >= 3.2
pkg.version '2.3.9'
pkg.md5sum '3ee81372528048b8305334ab6f36b4e9'
else
raise "rubygem-winrm #{version} has not been configured; Cannot continue."
pkg.version '2.3.6'
pkg.md5sum 'a99f8e81343f61caa441eb1397a1c6ae'
end

instance_eval File.read('configs/components/_base-rubygem.rb')
Expand Down
6 changes: 3 additions & 3 deletions configs/projects/bolt-runtime.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
project 'bolt-runtime' do |proj|
# Used in component configurations to conditionally include dependencies
proj.setting(:runtime_project, 'bolt')
proj.setting(:ruby_version, '2.7.8')
proj.setting(:ruby_version, '3.2.5')
proj.setting(:openssl_version, '1.1.1')
proj.setting(:rubygem_net_ssh_version, '6.1.0')
proj.setting(:rubygem_net_ssh_version, '7.2.3')
proj.setting(:augeas_version, '1.14.1')
# TODO: Can runtime projects use these updated versions?
proj.setting(:rubygem_deep_merge_version, '1.2.2')
proj.setting(:rubygem_puppet_version, '7.32.1')
proj.setting(:rubygem_puppet_version, '8.8.1')

platform = proj.get_platform

Expand Down

0 comments on commit 44fe548

Please sign in to comment.