From 96f9c745e3dace22a3b547121c105a87ca44bd6b Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Wed, 3 Jan 2018 10:09:18 +0100 Subject: [PATCH 1/3] Test against Ruby 2.5 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index aba38c0..5b4555a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: env: GH_PAGES=true rvm: + - 2.5 - 2.4 - 2.3 - 2.2 From 03443a1603388fbe925b4d3e713f0fffe77e0e08 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 5 Jan 2018 22:04:35 +0100 Subject: [PATCH 2/3] Fix CI --- .rubocop.yml | 2 +- .travis.yml | 9 +++------ jekyll-redirect-from.gemspec | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 301d047..295b7e3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ inherit_gem: jekyll: .rubocop.yml AllCops: - TargetRubyVersion: 2.1 + TargetRubyVersion: 2.2 Exclude: - vendor/**/* diff --git a/.travis.yml b/.travis.yml index 5b4555a..32faf77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,15 @@ language: ruby -before_script: bundle update -script: "script/cibuild" sudo: false cache: bundler - matrix: include: - # GitHub Pages - rvm: 2.4.0 + rvm: 2.4.2 env: GH_PAGES=true - rvm: - 2.5 - 2.4 - 2.3 - 2.2 - - 2.1 +before_script: bundle update +script: script/cibuild diff --git a/jekyll-redirect-from.gemspec b/jekyll-redirect-from.gemspec index ed37a5c..f42cc2f 100644 --- a/jekyll-redirect-from.gemspec +++ b/jekyll-redirect-from.gemspec @@ -23,9 +23,9 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_runtime_dependency "jekyll", "~> 3.3" - spec.add_development_dependency "bundler", "~> 1.3" + spec.add_development_dependency "bundler", "~> 1.16" spec.add_development_dependency "jekyll-sitemap", "~> 1.0" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.5" - spec.add_development_dependency "rubocop", "~> 0.51" + spec.add_development_dependency "rubocop", "0.51" end From 48f8e5b63f0a5e3b593422e4196a01c9df792a6c Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 5 Jan 2018 22:27:18 +0100 Subject: [PATCH 3/3] Update gem version on build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 32faf77..61855dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,7 @@ rvm: - 2.4 - 2.3 - 2.2 +before_install: +- gem update --system before_script: bundle update script: script/cibuild