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

Updates to 4.3.6 to pass CI, adds Ubuntu 20.04 [changelog skip] #2380

Merged
merged 5 commits into from Sep 24, 2020

Conversation

MSP-Greg
Copy link
Member

Description

In the future, Puma 4.x may have security patches applied (hopefully not). PR adds CI on Ubuntu 20.04, so it updates SSL fixtures, along with a few backports.

Note that this does not include patches to compile without SSL.

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] or [ci skip] to the pull request title.
  • I have added appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

@nateberkopec nateberkopec added maintenance waiting-for-review Waiting on review from anyone labels Sep 23, 2020
@dentarg
Copy link
Member

dentarg commented Sep 24, 2020

100% green, nice! 🤩

@nateberkopec nateberkopec merged commit d2fca00 into puma:4.3.6 Sep 24, 2020
@MSP-Greg MSP-Greg deleted the 4.3.6-ssl-fixtures branch September 24, 2020 14:27
MSP-Greg added a commit to MSP-Greg/puma that referenced this pull request Nov 28, 2020
…#2380)

* Backport ssl fixtures/changes from puma#2333

* RuboCop server.rb

* Update Actions workflow, add Ubuntu 20.04

* Update extconf.rb

* Backport puma#2121

Co-authored-by: wjordan <will@code.org>

Co-authored-by: wjordan <will@code.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance waiting-for-review Waiting on review from anyone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants