Skip to content

Commit

Permalink
Merge pull request #704 from mhashizume/PA-5646/master/ruby_27
Browse files Browse the repository at this point in the history
(PA-5646) Pin to OpenSSL 1.1 Ruby 2.7
  • Loading branch information
joshcooper committed Jul 20, 2023
2 parents 17416f1 + 7186d38 commit 594e420
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions configs/components/_base-ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@
elsif platform.is_macos?
pkg.environment 'optflags', settings[:cflags]
if platform.is_cross_compiled?
# Pin to an older version of ruby@2.5. This can be removed once we're no longer cross-compiling
if ruby_version_y == "2.5"
pkg.build_requires "puppetlabs/puppet/ruby@2.5"
# Pin to an older version of ruby@2.7 hosted by Puppet as Homebrew
# moved its Ruby 2.7 formula from OpenSSL 1.1 to 3.0
if ruby_version_y == "2.7"
pkg.build_requires "puppetlabs/puppet/ruby@2.7"
else
pkg.build_requires "ruby@#{ruby_version_y}"
end
Expand Down

0 comments on commit 594e420

Please sign in to comment.