Skip to content

Commit

Permalink
Port install_if Gemfile forward and move Windows to 3.0.9 as well
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 Aug 19, 2024
1 parent c01d3a8 commit 45e4bcb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ gem "cookstyle"
# unless you build without and reintroduce it manually.
# Remove once we're no longer supporting Ruby 3.0.x.
# Also, fips_mode may need it
gem "openssl", "= 3.2.0"
install_if -> { RUBY_PLATFORM !~ /darwin/ && ENV["BUILDKITE_PIPELINE_SLUG"] !~ /verify/ } do
gem "openssl", "= 3.2.0"
end

# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
Expand All @@ -32,4 +34,4 @@ end

group :test do
gem "rake"
end
end
2 changes: 0 additions & 2 deletions omnibus_overrides.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
# if you need to calculate openssl environment
openssl_version_default =
case
when windows?
"1.0.2zi"
when macos?
"1.1.1m"
else
Expand Down

0 comments on commit 45e4bcb

Please sign in to comment.