(PA-5666) Fix pl-ruby-patch's filename #708
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Starting with Ruby 3.2.2 we want to change the file we are sed'ing.
|
Example adhoc job built with this runtime passing with osx-12-arm: https://jenkins-platform.delivery.puppetlabs.net/view/puppet-agent/view/ad-hoc/job/platform_puppet-agent-extra_puppet-agent-integration-suite_adhoc-ad_hoc/1158/ |
cthorn42
commented
Aug 1, 2023
| @@ -61,9 +61,16 @@ | |||
| sed_command = %(s|Gem.ruby.shellsplit|& << '-r/opt/puppetlabs/puppet/share/doc/rbconfig-#{settings[:ruby_version]}-orig.rb'|) | |||
| end | |||
|
|
|||
| # rubygems switched which file has the command we need to patch starting with ruby 3.2.2 | |||
| if Gem::Version.new(settings[:ruby_version]) >= Gem::Version.new('3.2.2') | |||
There was a problem hiding this comment.
I'm not sure of a better way to check for semantic versioning, but this is what a Google search suggested and it works.
There was a problem hiding this comment.
👍 we use that in puppet too
|
This is the commit to ruby's |
joshcooper
approved these changes
Aug 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Starting with Ruby 3.2.2 we want to change the file we are sed'ing.