Skip to content

Commit

Permalink
Default to Ruby 3.1.2's openssl default gem
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Powell <thomas.powell@progress.com>
  • Loading branch information
tpowell-progress committed Mar 19, 2024
1 parent 4ca0cb1 commit ccfedfd
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions config/software/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,11 @@
if version.satisfies?("< 3.1") &&
project.overrides[:openssl] &&
ChefUtils::VersionString.new(project.overrides[:openssl][:version]).satisfies?(">= 3.0")
# use the same version as ruby 3.1.3 version has as default, so that the chef gemfile is just redundant
command "curl https://rubygems.org/downloads/openssl-3.0.1.gem --output openssl-3.0.1.gem"
command "#{install_dir}/embedded/bin/gem install openssl-3.0.1.gem --no-document"

# use the same version as ruby 3.1.2 version has as default, so that the chef gemfile is just redundant
openssl_gem_version = project.overrides.dig(:ruby, :openssl_gem) || "3.0.0"
command "curl https://rubygems.org/downloads/openssl-#{openssl_gem_version}.gem --output openssl-#{openssl_gem_version}.gem"
command "#{install_dir}/embedded/bin/gem install openssl-#{openssl_gem_version}.gem --no-document"
end

if windows?
Expand Down

0 comments on commit ccfedfd

Please sign in to comment.