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.

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

Update bundler and uri #4124

Merged
merged 5 commits into from
Nov 18, 2024
Merged

Update bundler and uri #4124

merged 5 commits into from
Nov 18, 2024

Conversation

TonyCTHsu
Copy link
Contributor

@TonyCTHsu TonyCTHsu commented Nov 18, 2024

Motivation:

  • For Ruby 3+ runtimes, we are using Bundler 2.5.21 instead of 2.3.26. And hopefully, the constraint on uri gem is no longer required.
  • It brings us closer to bundler 2.5.22, which contains vendoring uri and a fix for pysch

https://github.com/rubygems/rubygems/blob/master/bundler/CHANGELOG.md#2522-october-16-2024

What does this PR do?

  1. Update Bundler version in lockfiles
  2. Update uri gem

@TonyCTHsu TonyCTHsu marked this pull request as ready for review November 18, 2024 12:09
@TonyCTHsu TonyCTHsu requested a review from a team as a code owner November 18, 2024 12:09
@TonyCTHsu TonyCTHsu added the dev/testing Involves testing processes (e.g. RSpec) label Nov 18, 2024
@codecov-commenter
Copy link

codecov-commenter commented Nov 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.78%. Comparing base (8015804) to head (fa30379).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #4124      +/-   ##
==========================================
+ Coverage   97.77%   97.78%   +0.01%     
==========================================
  Files        1350     1350              
  Lines       81262    81263       +1     
  Branches     4108     4108              
==========================================
+ Hits        79452    79463      +11     
+ Misses       1810     1800      -10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@p-datadog
Copy link
Contributor

This is strange to me:

--- a/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock
+++ b/gemfiles/ruby_3.1_elasticsearch_7.gemfile.lock
@@ -155,7 +155,7 @@ GEM
     strscan (3.1.0)
     thor (1.2.2)
     unicode-display_width (2.5.0)
-    uri (1.0.1)
+    uri (1.0.2)
     warning (1.3.0)
     webmock (3.19.1)
       addressable (>= 2.8.0)
@@ -198,10 +198,9 @@ DEPENDENCIES
   rubocop-rspec (~> 2.20, < 2.21)
   simplecov!
   simplecov-cobertura (~> 2.1.0)
-  uri (~> 0.13.1)
   warning (~> 1)
   webmock (>= 3.10.0)
   webrick (>= 1.7.0)
 
 BUNDLED WITH
-   2.3.26
+   2.5.21

In master uri was 0.13.1 and 1.0.1 at the same time?

@TonyCTHsu
Copy link
Contributor Author

Merging this and address benchmark later. Because branch conflict is hard

@TonyCTHsu TonyCTHsu merged commit 2d82212 into master Nov 18, 2024
274 of 275 checks passed
@TonyCTHsu TonyCTHsu deleted the tonycthsu/bundle-update branch November 18, 2024 15:18
@github-actions github-actions bot added this to the 2.8.0 milestone Nov 18, 2024
@p-datadog p-datadog added the dev/internal Other internal work that does not need to be included in the changelog label Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dev/internal Other internal work that does not need to be included in the changelog dev/testing Involves testing processes (e.g. RSpec)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants