Skip to content

Re-introduce Ruby 2.3 support and test Jekyll 3.7+ #72

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.

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

Merged
merged 2 commits into from
Mar 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inherit_gem:
rubocop-jekyll: .rubocop.yml

AllCops:
TargetRubyVersion: 2.4
TargetRubyVersion: 2.3
Exclude:
- vendor/**/*
- spec/*.rb
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
language: ruby
cache: bundler
rvm:
- 2.6
- &latest_ruby 2.6
- 2.4
- 2.3

script : script/cibuild

branches:
only:
- master
env:
- JEKYLL_VERSION=3.7.4

matrix:
- JEKYLL_VERSION="~> 3.8"
matrix:
include:
- # GitHub Pages
rvm: 2.5.3
env: GH_PAGES=true
env: JEKYLL_VERSION="~> 3.7.4"
- rvm: *latest_ruby
env: JEKYLL_VERSION=">= 4.0.0.pre.alpha1"

notifications:
email: false
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@
source "https://rubygems.org"
gemspec

if ENV["GH_PAGES"]
gem "github-pages"
elsif ENV["JEKYLL_VERSION"]
gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
end
gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]
12 changes: 6 additions & 6 deletions jekyll-gist.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ Gem::Specification.new do |spec|
spec.homepage = "https://github.com/jekyll/jekyll-gist"
spec.license = "MIT"

spec.required_ruby_version = ">= 2.4.0"

spec.files = `git ls-files -z`.split("\x0")
spec.executables = spec.files.grep(%r!^bin/!) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
spec.test_files = spec.files.grep(%r!^spec/!)
spec.require_paths = ["lib"]

spec.add_dependency "octokit", "~> 4.2"
spec.required_ruby_version = ">= 2.3.0"

spec.add_runtime_dependency "jekyll", ">= 3.7", "< 5.0"
spec.add_runtime_dependency "octokit", "~> 4.2"

spec.add_development_dependency "bundler"
spec.add_development_dependency "jekyll", ">= 3.7", "< 5.0"
spec.add_development_dependency "rake"
spec.add_development_dependency "rspec"
spec.add_development_dependency "rubocop-jekyll", "~> 0.4"
Expand Down
6 changes: 4 additions & 2 deletions lib/jekyll-gist/gist_tag.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ def render(context)
else
raise ArgumentError, <<~ERROR
Syntax error in tag 'gist' while parsing the following markup:
#{@markup}
Valid syntax:

#{@markup}

Valid syntax:
{% gist user/1234567 %}
{% gist user/1234567 foo.js %}
{% gist 28949e1d5ee2273f9fd3 %}
Expand Down