From a117162dd5a43327b98c16498d6a7381969498f9 Mon Sep 17 00:00:00 2001 From: alex501212 Date: Mon, 11 Nov 2024 17:31:12 +0000 Subject: [PATCH 1/3] updated gems and bolt runtime for r10k 4 --- .../rubygem-faraday-net_http_persistent.rb | 14 ++++++++++++-- configs/components/rubygem-orchestrator_client.rb | 4 ++-- configs/projects/bolt-runtime.rb | 6 +++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/configs/components/rubygem-faraday-net_http_persistent.rb b/configs/components/rubygem-faraday-net_http_persistent.rb index 890658829..095c0f0bc 100644 --- a/configs/components/rubygem-faraday-net_http_persistent.rb +++ b/configs/components/rubygem-faraday-net_http_persistent.rb @@ -1,6 +1,16 @@ component 'rubygem-faraday-net_http_persistent' do |pkg, settings, platform| - pkg.version '1.2.0' - pkg.md5sum 'e13bafd2297cbf703e0385e142c9ce62' + version = settings[:rubygem_faraday_net_http_persistent_version] || '1.2.0' + + case version + when '1.2.0' + pkg.version '1.2.0' + pkg.md5sum 'e13bafd2297cbf703e0385e142c9ce62' + when '2.3.0' + pkg.version '2.3.0' + pkg.md5sum 'b8003472ed288c44021dcfed574353b2' + else + raise "rubygem-faraday version #{version} is not supported" + end instance_eval File.read('configs/components/_base-rubygem.rb') end diff --git a/configs/components/rubygem-orchestrator_client.rb b/configs/components/rubygem-orchestrator_client.rb index e4b8f0a60..9b49f3db7 100644 --- a/configs/components/rubygem-orchestrator_client.rb +++ b/configs/components/rubygem-orchestrator_client.rb @@ -1,6 +1,6 @@ component 'rubygem-orchestrator_client' do |pkg, settings, platform| - pkg.version '0.7.0' - pkg.md5sum '03fb7c2fb2d8d407b638e31761bc0d92' + pkg.version '0.7.1' + pkg.md5sum '177686e31c134ae9fdee25ba8c0404a0' instance_eval File.read('configs/components/_base-rubygem.rb') end \ No newline at end of file diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb index 6141ab4e1..44a6978cc 100644 --- a/configs/projects/bolt-runtime.rb +++ b/configs/projects/bolt-runtime.rb @@ -10,6 +10,10 @@ # TODO: Can runtime projects use these updated versions? proj.setting(:rubygem_deep_merge_version, '1.2.2') proj.setting(:rubygem_puppet_version, '8.8.1') + proj.setting(:rubygem_puppet_forge_version, '5.0.4') + proj.setting(:rubygem_faraday_version, '2.12.0') + proj.setting(:rubygem_faraday_net_http_version, '3.3.0') + proj.setting(:rubygem_faraday_net_http_persistent_version, '2.3.0') platform = proj.get_platform @@ -158,7 +162,7 @@ proj.component 'rubygem-faraday-patron' proj.component 'rubygem-faraday-rack' proj.component 'rubygem-faraday-retry' - proj.component 'rubygem-faraday_middleware' + proj.component 'rubygem-faraday-follow_redirects' proj.component 'rubygem-ruby2_keywords' # Core dependencies From b80b58a3f8dc3d097d77abc740ac722eb3aa53c6 Mon Sep 17 00:00:00 2001 From: alex501212 Date: Mon, 11 Nov 2024 18:00:13 +0000 Subject: [PATCH 2/3] update r10k for bolt-runtime --- configs/components/rubygem-r10k.rb | 14 ++++++++++++-- configs/projects/bolt-runtime.rb | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/components/rubygem-r10k.rb b/configs/components/rubygem-r10k.rb index 3de2f8659..8c6a89d20 100644 --- a/configs/components/rubygem-r10k.rb +++ b/configs/components/rubygem-r10k.rb @@ -1,6 +1,16 @@ component 'rubygem-r10k' do |pkg, settings, platform| - pkg.version '4.1.0' - pkg.sha256sum '64e5b9e1a6cbb4006c96477d8c34ce589fe1c278117311f452d9f30b9cc86e4c' + version = settings[:rubygem_r10k_version] || '3.16.2' + + case version + when '3.16.2' + pkg.version '3.16.2' + pkg.sha256sum '9775a726ba94a543bf49952b10dcd23690a54f5d2a361746b78b1292abe32eb9' + when '4.1.0' + pkg.version '4.1.0' + pkg.sha256sum '64e5b9e1a6cbb4006c96477d8c34ce589fe1c278117311f452d9f30b9cc86e4c' + else + raise "rubygem-r10k version #{version} is not supported" + end instance_eval File.read('configs/components/_base-rubygem.rb') end diff --git a/configs/projects/bolt-runtime.rb b/configs/projects/bolt-runtime.rb index 44a6978cc..b14f907c0 100644 --- a/configs/projects/bolt-runtime.rb +++ b/configs/projects/bolt-runtime.rb @@ -14,6 +14,7 @@ proj.setting(:rubygem_faraday_version, '2.12.0') proj.setting(:rubygem_faraday_net_http_version, '3.3.0') proj.setting(:rubygem_faraday_net_http_persistent_version, '2.3.0') + proj.setting(:rubygem_r10k_version, '4.1.0') platform = proj.get_platform From e51b9b0bc55facfbb952aa7cd8e312c7e4ea8760 Mon Sep 17 00:00:00 2001 From: alex501212 Date: Mon, 11 Nov 2024 18:17:08 +0000 Subject: [PATCH 3/3] update faraday-net_http_persistent no version support message --- configs/components/rubygem-faraday-net_http_persistent.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/rubygem-faraday-net_http_persistent.rb b/configs/components/rubygem-faraday-net_http_persistent.rb index 095c0f0bc..bad934a93 100644 --- a/configs/components/rubygem-faraday-net_http_persistent.rb +++ b/configs/components/rubygem-faraday-net_http_persistent.rb @@ -9,7 +9,7 @@ pkg.version '2.3.0' pkg.md5sum 'b8003472ed288c44021dcfed574353b2' else - raise "rubygem-faraday version #{version} is not supported" + raise "rubygem-faraday-net_http_persistent version #{version} is not supported" end instance_eval File.read('configs/components/_base-rubygem.rb')