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

Merge 3.18.x into 3.19.x #9336

Merged
merged 3 commits into from Dec 23, 2021
Merged

Merge 3.18.x into 3.19.x #9336

merged 3 commits into from Dec 23, 2021

Commits on Oct 15, 2021

  1. Update Mac test runs to download RVM directly from GitHub (protocolbu… 

    …ffers#9107)

Our Mac test runs recently started failing to download RVM. The issue
appears to be a combination of an SSL certificate expiring and old
OpenSSL versions having a bug preventing them from validating the
replacement certificate: rvm/rvm#5133

This commit works around the problem by downloading RVM from GitHub as
suggested in one of the comments on the issue above.
    @acozzette
    acozzette committed Oct 15, 2021
    Configuration menu
    Copy the full SHA
    8a0aa4b View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. Cherry-pick fix from protocolbuffers#9311 into 3.18.x (protocolbuffer… 

    …s#9320)

* Dropped Ruby 2.4 support for CI and releases.

* Removed Kokoro configs for old Ruby versions.

* Update Dockerfile to allow it to be rebuilt

Co-authored-by: Joshua Haberman <jhaberman@gmail.com>
    @acozzette @haberman
    acozzette and haberman committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    1fe07f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.18.x' into merge-3.18.x

    @acozzette
    acozzette committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    9227f60 View commit details
    Browse the repository at this point in the history