Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[deps] update Rubygems to latest 3.1 (3.1.6) #6294

Merged
merged 5 commits into from
Mar 24, 2021
Merged

[deps] update Rubygems to latest 3.1 (3.1.6) #6294

merged 5 commits into from
Mar 24, 2021

Conversation

kares
Copy link
Member

@kares kares commented Jun 23, 2020

targeting for 9.2.12

failing 2 ruby specs atm - needs investigation as RGs changed path handling:

1)
Kernel#require (path resolution) raises a TypeError if passed an object that has #to_s but not #to_str FAILED
Expected TypeError but no exception was raised (true was returned)
/home/travis/build/kares/jruby/spec/ruby/core/kernel/shared/require.rb:80:in `block in <main>'
org/jruby/RubyDir.java:439:in `chdir'
/home/travis/build/kares/jruby/spec/ruby/core/kernel/shared/require.rb:79:in `block in <main>'
org/jruby/RubyBasicObject.java:2622:in `instance_eval'
org/jruby/RubyEnumerable.java:1809:in `all?'
org/jruby/RubyArray.java:1809:in `each'
org/jruby/RubyArray.java:1809:in `each'
/home/travis/build/kares/jruby/spec/ruby/core/kernel/require_spec.rb:5:in `<main>'
org/jruby/RubyKernel.java:1009:in `load'
org/jruby/RubyBasicObject.java:2622:in `instance_eval'
org/jruby/RubyArray.java:1809:in `each'

2)
Kernel#require ($LOADED_FEATURES) does not load a ./ relative path that is already stored FAILED
Expected true to be false
/home/travis/build/kares/jruby/spec/ruby/core/kernel/shared/require.rb:397:in `block in <main>'
org/jruby/RubyDir.java:439:in `chdir'
/home/travis/build/kares/jruby/spec/ruby/core/kernel/shared/require.rb:396:in `block in <main>'
org/jruby/RubyBasicObject.java:2622:in `instance_eval'
org/jruby/RubyEnumerable.java:1809:in `all?'
org/jruby/RubyArray.java:1809:in `each'
org/jruby/RubyArray.java:1809:in `each'
/home/travis/build/kares/jruby/spec/ruby/core/kernel/require_spec.rb:5:in `<main>'
org/jruby/RubyKernel.java:1009:in `load'
org/jruby/RubyBasicObject.java:2622:in `instance_eval'
org/jruby/RubyArray.java:1809:in `each'

@deivid-rodriguez
Copy link
Contributor

I think this might be because of some bugs that I introduced in rubygems 3.1 require 😞.

Cherry-picking recent PRs fixing require issues should probably do the trick:

@kares
Copy link
Member Author

kares commented Jun 29, 2020

Thanks David, will those PRs get a backport for 3.1 or will the only land in 3.2?
Need to check Ruby 2.7 (the only one on RGs 3.x) whether they applied any patching over the default install.

@deivid-rodriguez
Copy link
Contributor

I think there's an intention to backport these fixes to rubygems 3.1.5 and include them with ruby 2.7.2. At least @hsbt assigned this ruby-core ticket to himself after I suggested it.

@headius
Copy link
Member

headius commented Jun 30, 2020

@deivid-rodriguez For context, we want to release JRuby 9.2.12 with RubyGems 3.1, but we need these fixes present. We are naturally reluctant to patch our shipped version of RubyGems if it's possible an upgrade will wipe them out.

@deivid-rodriguez
Copy link
Contributor

Thanks! @kares already explained that in rubygems/rubygems#3751, and it sounds totally reasonable to me.

@headius
Copy link
Member

headius commented Jun 30, 2020

@kares We're reaching endgame for 9.2.12 so I think we need to make a decision. Updating right before release makes me and @enebo a bit nervous.

Can you explain why you believe we need to do this update as part of the release, rather than just recommending that users gem update --system themselves?

@kares kares added this to the Invalid or Duplicate milestone Jul 21, 2020
@deivid-rodriguez
Copy link
Contributor

FWIW, 3.1.6 was released with these backports: https://blog.rubygems.org/2021/01/26/3.1.6-released.html.

@headius
Copy link
Member

headius commented Mar 17, 2021

@deivid-rodriguez Thank you!

@enebo Updating RubyGems is probably way out of scope for 9.2.17.0 but perhaps .18? cc @kares

@kares kares changed the title update Rubygems to latest (3.1.4) update Rubygems to latest 3.1 (3.1.6) Mar 23, 2021
@kares kares marked this pull request as ready for review March 23, 2021 08:05
@kares
Merge branch 'jruby-9.2' into rubygems_3.1.4-9.2
0e680f3 
* jruby-9.2: (181 commits)
  Update jar-dependencies
  Update Ruby version to 2.5.8
  Update io/console to the gem version
  Update Rake to match 2.5.8
  Update stdlib from 2.5.8
  Update for new launcher
  Untag passing zlib deflate specs
  Return inflate content, not finish result
  Only include gems in bundled or default
  Detect modules more robustly
  Restructure Set factory methods
  Missed change in pom.xml
  Remove the bin/ruby script from stdlib artifact
  Restore gem dir location for default bins
  Remove files installed by bundled gems
  Simplify bundled and default gem installs
  Include all of preinstalled + default gem contents
  Update for next dev cycle
  Remove wrong and extraneous constant assignment
  Update for 9.2.16.0
  ...
@kares kares modified the milestones: Invalid or Duplicate, 9.2.18.0 Mar 23, 2021
@kares kares changed the title update Rubygems to latest 3.1 (3.1.6) [deps] update Rubygems to latest 3.1 (3.1.6) Mar 23, 2021
@enebo enebo modified the milestones: JRuby 9.2.18.0, JRuby 9.2.17.0 Mar 24, 2021
@enebo enebo merged commit 86212ca into jruby:jruby-9.2 Mar 24, 2021
@chadlwilson chadlwilson mentioned this pull request Nov 12, 2021
Closed
@ahorek ahorek mentioned this pull request Apr 7, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@headius headius headius approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
JRuby 9.2.17.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@kares @deivid-rodriguez @headius @enebo