From 4a63b897df6c52bdb3d09d28881decf25acefc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 22 Apr 2018 09:41:38 -0300 Subject: [PATCH 1/5] Bump versions tested on TravisCI --- .travis.yml | 10 +++++----- Gemfile | 2 +- README.md | 4 ++-- test/helper.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59893c7957..58b3a03c2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,12 @@ 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.16.0 - jruby-head - rbx-3 matrix: diff --git a/Gemfile b/Gemfile index 8dc1f79b72..38b11041cc 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/README.md b/README.md index 6c1d0ac4e3..9b8dfd7320 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/test/helper.rb b/test/helper.rb index d0fe7816a9..ff3b675470 100644 --- a/test/helper.rb +++ b/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 From 0b82d0409f8d3e7cd0dbba196fd7904245b698df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 22 Apr 2018 11:28:55 -0300 Subject: [PATCH 2/5] Remove apparently unused stuff --- .rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index dbd1ee8758..3e2f35dc02 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,7 +5,6 @@ AllCops: StyleGuideCopsOnly: false Exclude: - 'tmp/**/*' - - 'gemfiles/vendor/**/*' - 'vendor/**/*' - 'Rakefile' From 304760aa8333992f3d65ea2e111022f786aa9136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 22 Apr 2018 11:41:14 -0300 Subject: [PATCH 3/5] Workaround for 2.5.1 Travis/Bundler issue --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 58b3a03c2f..47ea370de1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ 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" From e5924c33c0eb839e5b760b04590cd6f0d2b3de59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 22 Apr 2018 11:41:53 -0300 Subject: [PATCH 4/5] Remove no longer needed workaround --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47ea370de1..8da371151f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ 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: From 23bd3d073570a995d72fc74e95a6c23d09b91b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Tue, 24 Apr 2018 10:04:10 -0300 Subject: [PATCH 5/5] Jruby 9.1.17.0 is out! --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8da371151f..8d22e03dcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ rvm: - 2.4.4 - 2.5.1 - ruby-head - - jruby-9.1.16.0 + - jruby-9.1.17.0 - jruby-head - rbx-3 matrix: