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

Fixup #825

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Fixup #825

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
12 changes: 6 additions & 6 deletions configs/components/rubygem-ffi.rb
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.16.3'
pkg.sha256sum '6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb'
pkg.version '1.15.5'
pkg.sha256sum '6f2ed2fa68047962d6072b964420cba91d82ce6fa8ee251950c17fca6af3c2a0'
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.16.3'
when '1.15.5'
pkg.sha256sum '9acc4e474bef25dbcf827b1e6fce4067e9a1eff74a0296d25f0af392fafcd096'
end

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

pkg.url "https://rubygems.org/downloads/ffi-#{pkg.get_version}-x86-mingw32.gem"
Expand Down Expand Up @@ -157,4 +157,4 @@
%(#{platform[:sed]} -i '0,/ensure_required_ruby_version_met/b; /ensure_required_ruby_version_met/d' #{base_ruby}/rubygems/installer.rb)
end
end
end
end
2 changes: 1 addition & 1 deletion configs/components/rubygem-json-schema.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
component "rubygem-json-schema" do |pkg, settings, platform|
pkg.version "4.3.1"
pkg.version "4.3.0"
pkg.sha256sum "ac35bfabf99eea2b8b45fbccbb714b399fbe7824c621fc985048a9c2e45d58d2"

instance_eval File.read('configs/components/_base-rubygem.rb')
Expand Down
7 changes: 7 additions & 0 deletions configs/components/rubygem-semantic_puppet.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
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.1.0'
if platform.is_cross_compiled? && platform.is_solaris?
# solaris 10/11 sparc are failing in agent-runtime-7.x installing semantic_puppet because the gem requires ruby >= 2.7.0
# when cross compiling on sparc, we use ancient pl-ruby or equivalen. For these older platforms, use older semantic_puppet
version = '1.0.4'
end
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
Expand Down
Loading