From edc2dc9d3b0355a0090986ff35a577beec3451e6 Mon Sep 17 00:00:00 2001 From: Otto Urpelainen Date: Fri, 19 Feb 2021 00:13:15 +0200 Subject: [PATCH 1/2] Add Ruby 3.0 to CI jekyll-feed will be [included in Fedora 34][pkg] which will also use [Ruby 3.0 as system Ruby interpreter][ruby]. This combination is known to work, so it would make sense to add it to CI. In Ruby 3.0, `rss` moved from default gem to a bundled gem, thus it must be added as dependency when it is used. [pkg]: https://src.fedoraproject.org/rpms/rubygem-jekyll-feed [ruby]: https://fedoraproject.org/wiki/Changes/Ruby_3.0 --- .travis.yml | 10 +++++----- jekyll-feed.gemspec | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37a9125c..2f9e4dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,16 @@ language: ruby cache: bundler rvm: - - &latest_ruby 2.7 + - 3.0 + - 2.7 - 2.5 env: matrix: - JEKYLL_VERSION="~> 3.9" + - JEKYLL_VERSION="~> 4.2" matrix: - include: - - rvm: *latest_ruby - env: JEKYLL_VERSION="~> 3.9" - - rvm: *latest_ruby + exclude: + - rvm: 2.5 env: JEKYLL_VERSION="~> 4.2" before_install: - gem update --system diff --git a/jekyll-feed.gemspec b/jekyll-feed.gemspec index f96b9a32..7c171cdc 100644 --- a/jekyll-feed.gemspec +++ b/jekyll-feed.gemspec @@ -24,6 +24,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "nokogiri", "~> 1.6" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.0" + spec.add_development_dependency "rss" if RUBY_VERSION >= '3.0.0' spec.add_development_dependency "rubocop-jekyll", "~> 0.5" spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0" end From 03d32e6f9e2b1dd502d0b1c968ae45d2f45753a5 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 19 Feb 2021 12:10:55 +0100 Subject: [PATCH 2/2] fix: rss added in Gemfile --- jekyll-feed.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/jekyll-feed.gemspec b/jekyll-feed.gemspec index 7c171cdc..f96b9a32 100644 --- a/jekyll-feed.gemspec +++ b/jekyll-feed.gemspec @@ -24,7 +24,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "nokogiri", "~> 1.6" spec.add_development_dependency "rake", "~> 12.0" spec.add_development_dependency "rspec", "~> 3.0" - spec.add_development_dependency "rss" if RUBY_VERSION >= '3.0.0' spec.add_development_dependency "rubocop-jekyll", "~> 0.5" spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0" end