Bump jruby 9.4.12.1 #17696
Bump jruby 9.4.12.1 #17696
Conversation
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
|
This pull request does not have a backport label. Could you fix it @donoghuc? 🙏
|
Something appears to have changed in code loading where this require is no longer in the call chain. Explicitly require it here.
donoghuc
force-pushed
the
bump-jruby-9.4.12.1
branch
from
6604658 to
973ff98
Compare
|
I think i've got PR tests green, kicked off an acceptance test build https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline/builds/1944 Next step is trying to understand the bundler and gem changes ported over from 9.4.12.0 branch. |
| @@ -165,7 +185,7 @@ def execute_bundler_with_retry(options) | |||
| begin | |||
| execute_bundler(options) | |||
| break | |||
| rescue ::Bundler::VersionConflict => e | |||
| rescue ::Bundler::SolveFailure => e | |||
There was a problem hiding this comment.
lib/bootstrap/patches/gems.rb
Outdated
| @@ -29,3 +29,16 @@ def get(path, data = {}, content_type = 'application/x-www-form-urlencoded', req | |||
| end | |||
| end | |||
| end | |||
|
|
|||
| module ::Bundler | |||
There was a problem hiding this comment.
Instead of patching this, i think we were just sending an object instead of a string. Modified to send along a string instead of a Gem::Platform instance.
`Caused by: org.jruby.exceptions.NoMethodError: (NoMethodError) undefined method `empty?' for #<Gem::Platform:0x637b58c9>`
| @@ -48,8 +48,27 @@ def self.reset_paths! | |||
| # repository. This basically enabled the offline feature to work as | |||
| # we remove the gems from the vendor directory before packaging. | |||
| ::Bundler::Source::Rubygems.module_exec do | |||
There was a problem hiding this comment.
I'm having trouble understanding this patch. I wonder if it was a workaround for an upstream bug that has been fixed now? rubygems/rubygems@b9a2d4d
Experimenting with just removing the patch all together.
donoghuc
force-pushed
the
bump-jruby-9.4.12.1
branch
from
81ea787 to
8f1cca4
Compare
This commit makes 2 changes: 1. We were sending a `Gem::Platform` instance to Thor parser instead of a string. Convert to string version of a platform name. With newly added checks in Thor, we were getting `noMethodError` for `Gem::Platform`. 2. It looks like there was a patch to get around a bug in bundler that was reaching out to the network for local gems. This appears to have been fixed upstream, this removes the patch.
donoghuc
force-pushed
the
bump-jruby-9.4.12.1
branch
from
8f1cca4 to
7f97c7b
Compare
Still validating this. Essentially ensure we check local gems when calling cache using the updated rubygems class.
|
💚 Build Succeeded
History
|
WIP: Continuation of #16986
TODO: fill out PR description and track down CI failures.