Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PE-38079) Gem updates to prepare for upcomming pe release #821

Merged
merged 1 commit into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configs/components/rubygem-CFPropertyList.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
component 'rubygem-CFPropertyList' do |pkg, settings, platform|
if settings[:ruby_version].to_f >= 3.2
pkg.version '3.0.6'
pkg.md5sum 'a10c1a40d093160f7264c0985b89881d'
pkg.version '3.0.7'
pkg.md5sum 'ed89ce5e7074a6f8e8b8e744eaf014d0'
else
pkg.version '2.3.6'
pkg.md5sum 'ae4086185992f293ffab1641b83286a5'
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-addressable.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-addressable" do |pkg, settings, platform|
pkg.version "2.8.5"
pkg.sha256sum "63f0fbcde42edf116d6da98a9437f19dd1692152f1efa3fcc4741e443c772117"
pkg.version "2.8.6"
pkg.sha256sum "798f6af3556641a7619bad1dce04cdb6eb44b0216a991b0396ea7339276f2b47"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-aws-eventstream.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-aws-eventstream" do |pkg, settings, platform|
pkg.version "1.2.0"
pkg.md5sum "47689acbf31e71cd5fb3877cce3d9d58"
pkg.version "1.3.0"
pkg.md5sum "e50f43c1f2d7805bbeaa155c6b52e033"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
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.831.0"
pkg.md5sum "9a25c0714eb323e8b2f8b77ac1b86b0c"
pkg.version "1.913.0"
pkg.md5sum "6231fd992c84e56941488776aa0be8b5"

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.185.0"
pkg.md5sum "834895779a8bc78112f26492688c8295"
pkg.version "3.191.6"
pkg.md5sum "cdce9ffd297496550ec650fe7c0f0c0e"

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.411.0"
pkg.md5sum "1f915f9bb6344d054a29c17478789460"
pkg.version "1.448.0"
pkg.md5sum "79f7f0f2fd051cedda210399d45590c6"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-aws-sigv4.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-aws-sigv4" do |pkg, settings, platform|
pkg.version "1.6.0"
pkg.md5sum "a5a45f14886bbdcff038262a80dc4c75"
pkg.version "1.8.0"
pkg.md5sum "586f3e0e914c67bae0b8793e64347c03"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
6 changes: 6 additions & 0 deletions configs/components/rubygem-base64.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
component 'rubygem-bas64' do |pkg, settings, platform|
pkg.version '0.2.0'
pkg.md5sum 'fe02f4347a5846f79f4d4615edababd3'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-bindata.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-bindata' do |pkg, settings, platform|
pkg.version '2.4.15'
pkg.md5sum '55ccdea22d70273b136e573dba9b97cf'
pkg.version '2.5.0'
pkg.md5sum 'c893016c3b689893b033e12536faeeab'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
6 changes: 3 additions & 3 deletions configs/components/rubygem-concurrent-ruby.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
component 'rubygem-concurrent-ruby' do |pkg, settings, platform|
# Projects may define a :rubygem_concurrent_ruby_version setting
version = settings[:rubygem_concurrent_ruby_version] || '1.2.2'
version = settings[:rubygem_concurrent_ruby_version] || '1.2.3'
pkg.version version

case version
when '1.2.2'
pkg.sha256sum '3879119b8b75e3b62616acc256c64a134d0b0a7a9a3fcba5a233025bcde22c4f'
when '1.2.3'
pkg.sha256sum '82fdd3f8a0816e28d513e637bb2b90a45d7b982bdf4f3a0511722d2e495801e2'
else
raise "rubygem-concurrent-ruby #{version} has not been configured; Cannot continue."
end
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-diff-lcs.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-diff-lcs" do |pkg, settings, platform|
pkg.version "1.5.0"
pkg.sha256sum "49b934001c8c6aedb37ba19daec5c634da27b318a7a3c654ae979d6ba1929b67"
pkg.version "1.5.1"
pkg.sha256sum "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-facter.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-facter' do |pkg, settings, platform|
pkg.version '4.5.0'
pkg.md5sum 'b10500668a69db77ddb65907be2bd908'
pkg.version '4.7.0'
pkg.md5sum 'b77bcd4ed8ebf713717a89014b835830'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
10 changes: 5 additions & 5 deletions configs/components/rubygem-ffi.rb
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've seen issues with Facter and FFI >= 1.16.0 so we've pinned to 1.15.5 in both Facter and Puppet.

We are planning to resolve these issues this quarter in FACT-3434, could we hold off on the bump til then?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, sorry ffi revert #825

Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
pkg.version '1.13.1'
pkg.sha256sum '4e15f52ee45af7c5674d656041855448adbb5022618be252cd602d81b8e2978a'
else
pkg.version '1.15.5'
pkg.sha256sum '6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'
pkg.version '1.16.3'
pkg.sha256sum '6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb'
end

instance_eval File.read('configs/components/_base-rubygem.rb')
Expand Down Expand Up @@ -59,7 +59,7 @@
case pkg.get_version
when '1.9.25'
pkg.sha256sum '5473ac958b78f271f53e9a88197c35cd3e990fbe625d21e525c56d62ae3750da'
when '1.15.5'
when '1.16.3'
pkg.sha256sum '9acc4e474bef25dbcf827b1e6fce4067e9a1eff74a0296d25f0af392fafcd096'
end

Expand All @@ -70,8 +70,8 @@
case pkg.get_version
when '1.9.25'
pkg.sha256sum '43d357732a6a0e3e41dc7e28a9c9c5112ac66f4a6ed9e1de40afba9ffcb836c1'
when '1.15.5'
pkg.sha256sum '6e52c39fdbbccc085ae05d489d1b835ce05dcdf2a4c88ba739e3b42afd2b5404'
when '1.16.3'
pkg.sha256sum 'ee49ccfa125f84a2f2053a0e6dd8433a34233479e026513ecbf06798ba542fe6'
end

pkg.url "https://rubygems.org/downloads/ffi-#{pkg.get_version}-x86-mingw32.gem"
Expand Down
6 changes: 3 additions & 3 deletions configs/components/rubygem-gettext.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
component "rubygem-gettext" do |pkg, settings, platform|
version = settings[:rubygem_gettext_version] || '3.4.3'
version = settings[:rubygem_gettext_version] || '3.4.9'
pkg.version version

case version
when '3.4.3'
pkg.sha256sum '1b98e1272d0f55a56f519ee86d24e0fcd114b94c9d10b26e72512d65f9174251'
when '3.4.9'
pkg.sha256sum '292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a'
when '3.2.2'
pkg.sha256sum '9d250bb79273efb4a268977f219d2daca05cdc7473eff40288b8ab8ddd0f51b4'
else
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-json-schema.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-json-schema" do |pkg, settings, platform|
pkg.version "4.1.1"
pkg.sha256sum "89a8399745a710c2c7be3ff9564f67a0ae982c82f7590a95ab9cebe374fa2d49"
pkg.version "4.3.1"
pkg.sha256sum "ac35bfabf99eea2b8b45fbccbb714b399fbe7824c621fc985048a9c2e45d58d2"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-jwt.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-jwt" do |pkg, settings, platform|
pkg.version "2.2.3"
pkg.md5sum "a25cbd9b40f8da7a40faad7a26b8153c"
pkg.version "2.7.1"
pkg.md5sum "d3a7ba14444b03f91c7d36b61519fe17"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-locale.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-locale" do |pkg, settings, platform|
pkg.version "2.1.3"
pkg.md5sum "f5bef9eed8e8c40417a3ab68fa34f477"
pkg.version "2.1.4"
pkg.md5sum "c324a7f34b94044f8d38eabff159de62"

instance_eval File.read('configs/components/_base-rubygem.rb')

Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-multipart-post.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-multipart-post' do |pkg, settings, platform|
pkg.version '2.3.0'
pkg.md5sum '067cd7270a1f476ce71454d499213671'
pkg.version '2.4.0'
pkg.md5sum '626fd8b3f8cd080c1eccfa0e25d7bfed'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-net-ssh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
pkg.version version

case version
when "7.0.1"
pkg.md5sum "2ac500ae0a9c578b64d8c3a4bff741c0"
when "7.2.3"
pkg.md5sum "be25f70538cb8dcde68d924f001d75df"
when "6.1.0"
pkg.md5sum "383afadb1bd66a458a5d8d2d60736b3d"
when "5.2.0"
Expand Down
6 changes: 6 additions & 0 deletions configs/components/rubygem-nkf.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
component 'rubygem-nkf' do |pkg, settings, platform|
pkg.version '0.2.0'
pkg.md5sum '7a0af896fa45703c594cf0535096a8ed'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-optimist.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-optimist' do |pkg, settings, _platform|
pkg.version '3.0.1'
pkg.md5sum 'ce7ee8dac7e34793756680c2af9a8ee9'
pkg.version '3.1.0'
pkg.md5sum 'bd9b5fc3bfba641766817760cc8b58e9'

instance_eval File.read('configs/components/_base-rubygem.rb')

Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-public_suffix.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-public_suffix' do |pkg, _settings, _platform|
pkg.version '5.0.1'
pkg.md5sum '504e45c1f5f7b629e46e4deef7d0f46f'
pkg.version '5.0.5'
pkg.md5sum '1e6879068c1bc976a0ba890a4b11b24d'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
6 changes: 3 additions & 3 deletions configs/components/rubygem-puppet-strings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# 2021.7.x LTS has a jruby that does not work with puppet-strings
# version 4.y. The 4 series requires ruby >= 2.7
# Default to 4.x sereies but allow it to be configuratble by project.
version = settings[:rubygem_puppet_strings_version] || '4.1.0'
version = settings[:rubygem_puppet_strings_version] || '4.1.2'
pkg.version(version)

case version
when '3.0.1'
pkg.md5sum '7c9a8936509a0434c39975a75197472c'
when '4.1.0'
pkg.md5sum 'd8259d8a9144757f4e78f118b59e2681'
when '4.1.2'
pkg.md5sum 'e19f3fdc60692df346d1a348ab9facee'
else
raise "Invalid version #{version} for rubygem-puppet-strings; Cannot continue."
end
Expand Down
12 changes: 4 additions & 8 deletions configs/components/rubygem-puppet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@
#
# Always use the generic version below
case version
when '8.3.1'
pkg.md5sum '9cff495eff59639fce989dceeff34560'
when '8.0.1'
pkg.md5sum '7e87d988e485c0f0c3d6ef76bd39409d'
when '7.27.0'
pkg.md5sum '6a49f375dffe5f786ed474b3eaaaf931'
when '7.26.0'
pkg.md5sum '347ec39281f59232be5cbb47daf9b539'
when '8.6.0'
pkg.md5sum '5ac831a42a5fbaef9c6e320c64bbcbd5'
when '7.30.0'
pkg.md5sum '1b36ae786efdf3c91edf60f60af54af7'
when '6.28.0'
pkg.md5sum '31520d986869f9362c88c7d6a4a5c103'
else
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-puppetfile-resolver.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component "rubygem-puppetfile-resolver" do |pkg, settings, platform|
pkg.version "0.6.2"
pkg.md5sum "e0b40ef4258d32d6d47857b1eb4a5acf"
pkg.version "0.6.3"
pkg.md5sum "8377387749cf0fcfcfd9f8c0c6baaf0c"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
6 changes: 3 additions & 3 deletions configs/components/rubygem-semantic_puppet.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
component "rubygem-semantic_puppet" do |pkg, settings, platform|
# Projects may define a :rubygem_semantic_puppet_version setting, or we use 1.0.4 by default
version = settings[:rubygem_semantic_puppet_version] || '1.0.4'
version = settings[:rubygem_semantic_puppet_version] || '1.1.0'
pkg.version version

case version
when '0.1.2'
pkg.md5sum '192ae7729997cb5d5364f64b99b13121'
when '1.0.4'
pkg.sha256sum "5d8380bf733c1552ef77e06a7c44a6d5b48def7d390ecf3bd71cad477f5ce13d"
when '1.1.0'
pkg.sha256sum "52d108d08e1a5d95c00343cb3a4936fb1deecff2be612ec39c9cb66be5a8b859"
else
raise "rubygem-semantic_puppet version #{version} has not been configured; Cannot continue."
end
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-yard.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
component 'rubygem-yard' do |pkg, settings, platform|
pkg.version '0.9.34'
pkg.md5sum '9c8530eaaf9acf6fd32ee4b51119e46a'
pkg.version '0.9.36'
pkg.md5sum 'ffaaaaafc1257e3bb98aea44fa47c05d'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
Expand Down
4 changes: 3 additions & 1 deletion configs/projects/_shared-pe-bolt-server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# Set desired versions for gem components that offer multiple versions:
# TODO: Can runtime projects use these updated versions?
proj.setting(:rubygem_deep_merge_version, '1.2.2')
proj.setting(:rubygem_net_ssh_version, '7.0.1')
proj.setting(:rubygem_net_ssh_version, '7.2.3')

# (pe-bolt-server does not run on Windows, so only the *nix path is here)
proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')
Expand Down Expand Up @@ -110,6 +110,7 @@
proj.component('rubygem-aws-sdk-core')
proj.component('rubygem-aws-sdk-ec2')
proj.component('rubygem-aws-sigv4')
proj.component('rubygem-base64')
proj.component('rubygem-bcrypt_pbkdf')
proj.component('rubygem-bindata')
proj.component('rubygem-builder')
Expand Down Expand Up @@ -140,6 +141,7 @@
proj.component('rubygem-net-scp')
proj.component('rubygem-net-ssh')
proj.component('rubygem-net-ssh-krb')
proj.component('rubygem-nkf')
proj.component('rubygem-rubyntlm')
proj.component('rubygem-nori')
proj.component('rubygem-orchestrator_client')
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/_shared-pe-bolt-server_with_ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# Set desired versions for gem components that offer multiple versions:
# TODO: Can runtime projects use these updated versions?
proj.setting(:rubygem_deep_merge_version, '1.2.2')
proj.setting(:rubygem_net_ssh_version, '7.0.1')
proj.setting(:rubygem_net_ssh_version, '7.2.3')

# (pe-bolt-server does not run on Windows, so only the *nix path is here)
proj.setting(:prefix, '/opt/puppetlabs/server/apps/bolt-server')
Expand Down
2 changes: 2 additions & 0 deletions configs/projects/_shared-pe-installer-runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
proj.component('rubygem-aws-sdk-core')
proj.component('rubygem-aws-sdk-ec2')
proj.component('rubygem-aws-sigv4')
proj.component('rubygem-base64')
proj.component('rubygem-bcrypt_pbkdf')
proj.component('rubygem-bindata')
proj.component('rubygem-builder')
Expand Down Expand Up @@ -121,6 +122,7 @@
proj.component('rubygem-net-http-persistent')
proj.component('rubygem-net-scp')
proj.component('rubygem-net-ssh-krb')
proj.component('rubygem-nkf')
proj.component('rubygem-nori')
proj.component('rubygem-rubyntlm')
proj.component('rubygem-orchestrator_client')
Expand Down
4 changes: 3 additions & 1 deletion configs/projects/bolt-runtime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
proj.setting(:augeas_version, '1.11.0')
# TODO: Can runtime projects use these updated versions?
proj.setting(:rubygem_deep_merge_version, '1.2.2')
proj.setting(:rubygem_puppet_version, '7.27.0')
proj.setting(:rubygem_puppet_version, '7.30.0')

platform = proj.get_platform

Expand Down Expand Up @@ -166,6 +166,7 @@
proj.component 'rubygem-aws-sdk-core'
proj.component 'rubygem-aws-sdk-ec2'
proj.component 'rubygem-aws-sigv4'
proj.component 'rubygem-base64'
proj.component 'rubygem-bindata'
proj.component 'rubygem-builder'
proj.component 'rubygem-CFPropertyList'
Expand Down Expand Up @@ -193,6 +194,7 @@
proj.component 'rubygem-net-scp'
proj.component 'rubygem-net-ssh'
proj.component 'rubygem-net-ssh-krb'
proj.component 'rubygem-nkf'
proj.component 'rubygem-nori'
proj.component 'rubygem-orchestrator_client'
proj.component 'rubygem-paint'
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/pe-bolt-server-runtime-2021.7.x.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project 'pe-bolt-server-runtime-2021.7.x' do |proj|
proj.setting(:pe_version, '2021.7')
proj.setting(:rubygem_puppet_version, '7.27.0')
proj.setting(:rubygem_puppet_version, '7.30.0')
proj.setting(:rubygem_puppet_strings_version, '3.0.1')
proj.setting(:rubygem_net_ssh_version, '6.1.0')
# We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
Expand Down
3 changes: 1 addition & 2 deletions configs/projects/pe-bolt-server-runtime-main.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
project 'pe-bolt-server-runtime-main' do |proj|
proj.setting(:pe_version, 'main')
proj.setting(:rubygem_puppet_version, '8.3.1')
proj.setting(:rubygem_net_ssh_version, '7.0.1')
proj.setting(:rubygem_puppet_version, '8.6.0')
# We build bolt server with the ruby installed in the puppet-agent dep. For ruby 2.7 we need to use a --no-document flag
# for gem installs instead of --no-ri --no-rdoc. This setting allows us to use this while we support both ruby 2.5 and 2.7
# Once we are no longer using ruby 2.5 we can update.
Expand Down
Loading
Loading