Skip to content

Commit 594e420

Browse files
authored
Merge pull request puppetlabs#704 from mhashizume/PA-5646/master/ruby_27
(PA-5646) Pin to OpenSSL 1.1 Ruby 2.7
2 parents 17416f1 + 7186d38 commit 594e420

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

configs/components/_base-ruby.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@
5959
elsif platform.is_macos?
6060
pkg.environment 'optflags', settings[:cflags]
6161
if platform.is_cross_compiled?
62-
# Pin to an older version of [email protected]. This can be removed once we're no longer cross-compiling
63-
if ruby_version_y == "2.5"
64-
pkg.build_requires "puppetlabs/puppet/[email protected]"
62+
# Pin to an older version of [email protected] hosted by Puppet as Homebrew
63+
# moved its Ruby 2.7 formula from OpenSSL 1.1 to 3.0
64+
if ruby_version_y == "2.7"
65+
pkg.build_requires "puppetlabs/puppet/[email protected]"
6566
else
6667
pkg.build_requires "ruby@#{ruby_version_y}"
6768
end

0 commit comments

Comments
 (0)