Merge pull request #778 from joshcooper/concurrent_ruby_122

(PA-5960) Use concurrent-ruby 1.2.2 for all runtimes
puppetlabs · Dec 20, 2023 · 9ba6ad1 · 9ba6ad1
2 parents 37f5cfa + f201ef9
commit 9ba6ad1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/configs/components/rubygem-concurrent-ruby.rb b/configs/components/rubygem-concurrent-ruby.rb
@@ -1,14 +1,13 @@
 component 'rubygem-concurrent-ruby' do |pkg, settings, platform|
   # Projects may define a :rubygem_concurrent_ruby_version setting
-  version = settings[:rubygem_concurrent_ruby_version] || '1.1.10'
+  version = settings[:rubygem_concurrent_ruby_version] || '1.2.2'
+  pkg.version version
 
   case version
-  when '1.1.9'
-    pkg.version '1.1.9'
-    pkg.md5sum '417a23cac840f6ea8bdd0841429c3c19'
-  when '1.1.10'
-    pkg.version '1.1.10'
-    pkg.md5sum '4588a61d5af26e9ee12e9b8babc1b755'
+  when '1.2.2'
+    pkg.sha256sum '3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f'
+  else
+    raise "rubygem-concurrent-ruby #{version} has not been configured; Cannot continue."
   end
 
   instance_eval File.read('configs/components/_base-rubygem.rb')

diff --git a/configs/projects/agent-runtime-7.x.rb b/configs/projects/agent-runtime-7.x.rb
@@ -6,7 +6,6 @@
   proj.setting :rubygem_fast_gettext_version, '1.1.2'
   proj.setting :rubygem_gettext_version, '3.2.2'
   proj.setting :rubygem_gettext_setup_version, '0.34'
-  proj.setting :rubygem_concurrent_ruby_version, '1.1.9'
 
   # Solaris and AIX depend on libedit which breaks augeas compliation starting with 1.13.0
   if platform.is_solaris? || platform.is_aix?

diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb
@@ -4,7 +4,6 @@
   proj.setting(:ruby_version, '2.7.8')
   proj.setting(:openssl_version, '1.1.1')
   proj.setting(:rubygem_net_ssh_version, '6.1.0')
-  proj.setting :rubygem_concurrent_ruby_version, '1.1.9'
   proj.setting(:augeas_version, '1.11.0')
   # TODO: Can runtime projects use these updated versions?
   proj.setting(:rubygem_deep_merge_version, '1.2.2')

diff --git a/configs/projects/pdk-runtime.rb b/configs/projects/pdk-runtime.rb
@@ -144,7 +144,6 @@
   proj.setting(:git_sysconfdir, '/etc')
 
   # Load PDK component definitions
-  proj.setting(:rubygem_concurrent_ruby_version, '1.1.10')
   proj.setting(:rubygem_deep_merge_version, '1.2.2')
   instance_eval File.read(File.join(File.dirname(__FILE__), '_pdk-components.rb'))