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

Test against Ruby 2.4.0 #5687

Merged
merged 6 commits into from Mar 31, 2017
Merged

Test against Ruby 2.4.0 #5687

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2133397
test against ruby-2.4.0
ashmaroli Dec 25, 2016
e463813
use compatible versions of gems
ashmaroli Dec 25, 2016
a1d98be
Merge branch 'master' into ruby-2.4.0
ashmaroli Jan 28, 2017
3da459e
update rubygems version on travis
ashmaroli Jan 28, 2017
48a94c4
Merge branch 'master' into ruby-2.4.0
DirtyF Feb 11, 2017
6123175
test with pygments 1.1 on all ruby versions
ashmaroli Feb 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -5,9 +5,10 @@ language: ruby
sudo: false

rvm:
- &ruby1 2.3.1
- &ruby2 2.2.5
- &ruby3 2.1.9
- &ruby1 2.4.0
- &ruby2 2.3.1
- &ruby3 2.2.5
- &ruby4 2.1.9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about bumping previous versions? Current versions are 2.3.3, 2.2.6, and 2.1.10. https://www.ruby-lang.org/en/downloads/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's for a separate PR. This PR is only about Ruby 2.4.
You're welcome to create a PR to bump the rvm versions we currently test against.
😃

- &jruby jruby-9.1.2.0

matrix:
Expand Down
8 changes: 7 additions & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -3,6 +3,13 @@ gemspec :name => "jekyll"

gem "rake", "~> 12.0"

if RUBY_VERSION >= '2.4'
gem "json", "~> 2.0"
gem "pygments.rb", "~> 1.1"
else
gem "pygments.rb", "~> 0.6.0" unless RUBY_ENGINE == "jruby"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use pygments.rb v1 with Ruby 2.1,2,3,4 instead of using 2 versions?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can.. but I wasn't sure if the change would affect Jekyll internally in any way..
I pushed a new commit to use just one version of pygments.rb

From the logs, it looks like we just need to change our assertions to match the new pygments syntax. But I don't want to undertake that task.

So, you're free to close this PR or assign someone to directly modify this branch.

end

# Dependency of jekyll-mentions. RubyGems in Ruby 2.1 doesn't shield us from this.
gem "activesupport", "~> 4.2", :groups => [:test_legacy, :site] if RUBY_VERSION < "2.2.2"

Expand Down Expand Up @@ -75,7 +82,6 @@ group :jekyll_optional_dependencies do
platform :ruby, :mswin, :mingw, :x64_mingw do
gem "classifier-reborn", "~> 2.0"
gem "liquid-c", "~> 3.0"
gem "pygments.rb", "~> 0.6.0"
gem "rdiscount", "~> 2.0"
gem "redcarpet", "~> 3.2", ">= 3.2.3"
end
Expand Down