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

Bump Ruby to 3.3.1 #9597

Merged
merged 14 commits into from Apr 30, 2024
Merged

Bump Ruby to 3.3.1 #9597

merged 14 commits into from Apr 30, 2024

Commits on Apr 26, 2024

  1. Bump Ruby to 3.3.0

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7be89db View commit details
    Browse the repository at this point in the history

  2. Patch Object#untaint for bundler 1

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    24e037f View commit details
    Browse the repository at this point in the history

  3. Also run tests using a patched bundler

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c8ac0ee View commit details
    Browse the repository at this point in the history

  4. Ruby 3.3.1 and explicit version of rubygems

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7f1628b View commit details
    Browse the repository at this point in the history

  5. Add custom WebMock handler for Gem::Net::HTTP

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    16ad2b7 View commit details
    Browse the repository at this point in the history

  6. Bundler::URI is now private, just use ::URI

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9573055 View commit details
    Browse the repository at this point in the history

  7. Share GemNetHTTPAdapter between tests

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    34fa5bb View commit details
    Browse the repository at this point in the history

  8. Ignore sorbet on some helpers and bin files

    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    be340f0 View commit details
    Browse the repository at this point in the history

  9. Don't bother running Rubocop on native test helper 

    This WebMock adapter is mostly a direct copy from WebMock itself, just
replaces `Net::HTTP` with `::Gem::Net:HTTP`, would like to keep them as
similar as possible if we ever need to keep changes in sync
    @jurre
    jurre committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3e362b5 View commit details
    Browse the repository at this point in the history

  10. Cleanup

    @jurre
    jurre committed Apr 26, 2024
    1 Configuration menu
    Copy the full SHA
    c8f9fc1 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Update previous Ruby versions 

    This is being done for two reasons:

1. We're upgrading to Ruby 3.3 (so we need to list previous versions)
2. Several CVEs were resolved in Ruby 3+ releases. We should use these

Co-authored-by: Bryan Dragon <25506+bdragon@users.noreply.github.com>
    @landongrindheim @bdragon
    landongrindheim and bdragon committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    e2dc892 View commit details
    Browse the repository at this point in the history

  2. Note the previous Ruby for Bundler v1 

    Co-authored-by: Bryan Dragon <25506+bdragon@users.noreply.github.com>
    @landongrindheim @bdragon
    landongrindheim and bdragon committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    81aead0 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Use latest Rubies in monkey patch 

    Per review feedback:

> I'd say you can add 3.1.5 and 3.2.4 too? I don't think the specific
patch level is super important sice normally gems with set their
requirements with something like required_ruby_version = ">= 2.6.0", so
all patch levels should have the same result. But best to use latest.

I've updated the Ruby versions to those which have received security
patches recently.
    @landongrindheim
    landongrindheim committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a438750 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into jurre/getting-jitty-with-it

    @landongrindheim
    landongrindheim committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    393402d View commit details
    Browse the repository at this point in the history