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.

Sign up for GitHub

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

Jump to bottom

dev: update CI and style settings #258

Merged
merged 5 commits into from
Jan 6, 2019
Merged

dev: update CI and style settings #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b44469
style: Target Ruby 2.4
DirtyF Jan 2, 2019
cf17b53
chore(ci): add Ruby 2.6, drop Ruby 2.3
DirtyF Jan 2, 2019
77e32fa
chore(deps): rubocop-jekyll 0.5
DirtyF Jan 3, 2019
e61f0e1
style: Style/IfUnlessModifier
DirtyF Jan 3, 2019
3f9c972
chore(deps): use latest bundler
DirtyF Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inherit_gem:
rubocop-jekyll: .rubocop.yml

AllCops:
TargetRubyVersion: 2.3
TargetRubyVersion: 2.4
Include:
- lib/**/*.rb

Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: ruby
cache: bundler
sudo: false
rvm:
- 2.5
- 2.3
- 2.6
- 2.4
env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
Expand Down
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@
source "https://rubygems.org"
gemspec

if ENV["JEKYLL_VERSION"]
gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
end
gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}" if ENV["JEKYLL_VERSION"]
4 changes: 2 additions & 2 deletions jekyll-feed.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = ">= 2.3.0"

spec.add_dependency "jekyll", "~> 3.3"
spec.add_development_dependency "bundler", "~> 1.15"
spec.add_development_dependency "bundler"
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 "rubocop-jekyll", "~> 0.4"
spec.add_development_dependency "rubocop-jekyll", "~> 0.5"
spec.add_development_dependency "typhoeus", ">= 0.7", "< 2.0"
end