Make ci work #1637
Merged
Make ci work #1637
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Update skip handling 2. Stability changes 3. Add Ruby & OpenSSL version info output 4. Bypassed SSL tests on DISABLE_SSL ?
1. mini_sll.c - add SSL version info 2. RuboCop fixes 3. control_cli.rb stability
MSP-Greg
force-pushed
the
make_ci_work
branch
from
4f7161b
to
f94db8d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since CI has gotten to the point where several of the PR's here would be needed to clean things up, I decided, to compile what I think should be done. The following has been passing in my fork on both Travis & Appveyor. Some notes:
First of all, due to JRuby issues, I bypassed the SSL tests in
test_puma_server_ssl.rbifPuma::MiniSSL.checkneeds a rescue.Added two versions of OSX to the matrix. At present, all Ubuntu Ruby versions are using OpenSSL v1.0.1. The OSX versions used test with 1.0.2 and 1.1.0.
Appveyor testing is constructing a gem file. Note that it tests with OpenSSL 1.0.2, 1.1.0, and OpenSSL master (1.1.1). All tests are passing.
Gemfile has rubocop & minitest updated to current versions.
Some of the updates were simply to allow RuboCop to pass (see Enable all Performance Cops #1624).
Test output now has a header with the Ruby description and OpenSSL versions built with and running with, similar to Ruby OpenSSL. See 7.
One test patch is included in the last commit by accident.
RUBY_VERSION => RUVY_REVISION => RUBY DESCRIPTION. I just couldn't get that right...
Apologies to anyone who's PR I've used here...
I'm happy to change things, re-organize things, etc. Thanks, Greg