From e50a98ce518cadb3a37f76cde67ba8c6e076f638 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 2 Feb 2017 14:33:59 +0900 Subject: [PATCH 1/3] Allow msgpack v1 --- fluentd.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluentd.gemspec b/fluentd.gemspec index 469f245cf0..697af2779d 100644 --- a/fluentd.gemspec +++ b/fluentd.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |gem| gem.required_ruby_version = '>= 1.9.3' - gem.add_runtime_dependency("msgpack", [">= 0.5.11", "< 0.6.0"]) + gem.add_runtime_dependency("msgpack", [">= 0.5.11", "< 2"]) gem.add_runtime_dependency("json", [">= 1.4.3"]) gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"]) gem.add_runtime_dependency("cool.io", [">= 1.2.2", "< 2.0.0"]) From be13675ee9a8eafd62764e0828473c5426e34e26 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 2 Feb 2017 14:34:34 +0900 Subject: [PATCH 2/3] travis-ci: Update testing ruby versions --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c79bb8e12..9a5ec3a25b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ language: ruby rvm: - 2.0.0 - 2.1 - - 2.2.3 - - 2.3.0 + - 2.2.6 + - 2.3.3 + - 2.4.0 - ruby-head - - rbx-2 os: - linux @@ -15,7 +15,6 @@ os: branches: only: - master - - v0.10 - v0.12 - v0.14 @@ -29,6 +28,3 @@ sudo: false matrix: allow_failures: - rvm: ruby-head - - rvm: rbx-2 - - rvm: 2.3.0 - - rvm: 1.9.3 From 956714cec8d8891034409e363b0019325353d677 Mon Sep 17 00:00:00 2001 From: Masahiro Nakagawa Date: Thu, 2 Feb 2017 19:57:47 +0900 Subject: [PATCH 3/3] travis: Remove ruby 2.2 test from osx --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9a5ec3a25b..3e056734ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,3 +28,6 @@ sudo: false matrix: allow_failures: - rvm: ruby-head + exclude: + - rvm: 2.2.6 + os: osx