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

Merge 3.18.x into 3.19.x #9336

Merged
merged 3 commits into from Dec 23, 2021
Merged

Conversation

acozzette
Copy link
Member

This PR merges 3.18.x into 3.19.x so that the 3.19.x branch will pick up the recent Ruby CI fixes.

acozzette and others added 3 commits October 15, 2021 14:41
…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.
…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 acozzette merged commit 9057466 into protocolbuffers:3.19.x Dec 23, 2021
@acozzette acozzette deleted the merge-3.18.x branch December 23, 2021 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants