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

Bump versions tested on TravisCI #1566

Merged
merged 5 commits into from May 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .rubocop.yml
Expand Up @@ -5,7 +5,6 @@ AllCops:
StyleGuideCopsOnly: false
Exclude:
- 'tmp/**/*'
- 'gemfiles/vendor/**/*'
- 'vendor/**/*'
- 'Rakefile'

Expand Down
15 changes: 7 additions & 8 deletions .travis.yml
Expand Up @@ -4,19 +4,18 @@ group: beta
language: ruby
cache: bundler
before_install:
# bundler installation needed for jruby-head
# https://github.com/travis-ci/travis-ci/issues/5861
- gem update --system
# https://github.com/travis-ci/travis-ci/issues/9383#issuecomment-377680108
- gem install bundler
branches:
only:
- "master"
rvm:
- 2.2.9
- 2.3.6
- 2.4.3
- 2.5.0
- 2.2.10
- 2.3.7
- 2.4.4
- 2.5.1
- ruby-head
- jruby-9.1.15.0
- jruby-9.1.17.0
- jruby-head
- rbx-3
matrix:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -13,6 +13,6 @@ gem "jruby-openssl", :platform => "jruby"

gem "rubocop", "~> 0.50.0"

if %w(2.2.7 2.2.8 2.2.9 2.3.4 2.4.1).include? RUBY_VERSION
if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
gem "stopgap_13632", "~> 1.0", :platforms => ["mri", "mingw", "x64_mingw"]
end
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -217,10 +217,10 @@ Some platforms do not support all Puma features.

## Known Bugs

For MRI versions 2.2.7, 2.2.8, 2.2.9, 2.3.4 and 2.4.1, you may see ```stream closed in another thread (IOError)```. It may be caused by a [Ruby bug](https://bugs.ruby-lang.org/issues/13632). It can be fixed with the gem https://rubygems.org/gems/stopgap_13632:
For MRI versions 2.2.7, 2.2.8, 2.2.9, 2.2.10 2.3.4 and 2.4.1, you may see ```stream closed in another thread (IOError)```. It may be caused by a [Ruby bug](https://bugs.ruby-lang.org/issues/13632). It can be fixed with the gem https://rubygems.org/gems/stopgap_13632:

```ruby
if %w(2.2.7 2.2.8 2.2.9 2.3.4 2.4.1).include? RUBY_VERSION
if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
begin
require 'stopgap_13632'
rescue LoadError
Expand Down
2 changes: 1 addition & 1 deletion test/helper.rb
@@ -1,7 +1,7 @@
# Copyright (c) 2011 Evan Phoenix
# Copyright (c) 2005 Zed A. Shaw

if %w(2.2.7 2.2.8 2.2.9 2.3.4 2.4.1).include? RUBY_VERSION
if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
begin
require 'stopgap_13632'
rescue LoadError
Expand Down