mirror of
https://github.com/jekyll/jekyll.git
synced 2026-01-11 16:08:02 -05:00
Fix CI builds on older Ruby versions (#7567)
* Fix CI builds on older Ruby versions * Use Bundler available by default * Remove deprecated Travis configuration
This commit is contained in:
@@ -2,7 +2,6 @@ bundler_args: --without benchmark:site:development
|
||||
script: script/cibuild
|
||||
cache: bundler
|
||||
language: ruby
|
||||
sudo: false
|
||||
|
||||
rvm:
|
||||
- &ruby1 2.5.1
|
||||
@@ -54,5 +53,4 @@ after_success:
|
||||
- bundle exec codeclimate-test-reporter
|
||||
|
||||
before_install:
|
||||
- gem update --system
|
||||
- gem install bundler
|
||||
- gem update --system || true
|
||||
|
||||
6
Gemfile
6
Gemfile
@@ -27,8 +27,8 @@ group :test do
|
||||
gem "httpclient"
|
||||
gem "jekyll_test_plugin"
|
||||
gem "jekyll_test_plugin_malicious"
|
||||
# nokogiri v1.8 does not work with ruby 2.1 and below
|
||||
gem "nokogiri", RUBY_VERSION >= "2.2" ? "~> 1.7" : "~> 1.7.0"
|
||||
# nokogiri v1.10 does not work with ruby 2.2 and below
|
||||
gem "nokogiri", RUBY_VERSION >= "2.3" ? "~> 1.9" : "~> 1.9.0"
|
||||
gem "rspec"
|
||||
gem "rspec-mocks"
|
||||
gem "rubocop", "~> 0.56.0"
|
||||
@@ -36,7 +36,7 @@ group :test do
|
||||
gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)
|
||||
gem "test-theme-symlink", :path => File.expand_path("test/fixtures/test-theme-symlink", __dir__)
|
||||
|
||||
gem "jruby-openssl" if RUBY_ENGINE == "jruby"
|
||||
gem "jruby-openssl", "0.10.1" if RUBY_ENGINE == "jruby"
|
||||
end
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user