Update to Jekyll 4.0
RFC PATCH 1/1 Update to Jekyll 4.0
- Update versions in Gemfile
- "has_key?" has to be renamed to "key?" in category_archive_plugin.rb
- Add .jekyll-cache to .gitignore file
--- .gitignore | 1 + Gemfile | 15 +++------------ _plugins/category_archive_plugin.rb | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-)
.gitignore +1 -0
@@ -2,3 +2,4 @@ /Gemfile.lock /vendor /.bundle +/.jekyll-cache
Gemfile +3 -12
@@ -9,10 +9,10 @@ ruby RUBY_VERSION # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "3.3.0" +gem "jekyll", "4.0.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" +gem "minima", "~> 2.5" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`.
@@ -20,14 +20,5 @@ gem "minima", "~> 2.0" # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" + gem "jekyll-feed", "~> 0.12" end - - -# for RHEL7 -gem 'public_suffix', "< 3.0" -gem 'jekyll-watch', '= 1.5.0' -gem 'listen', '< 3.1' -gem 'ruby_dep', '< 1.4' -gem 'json' -gem 'json_pure'
_plugins/category_archive_plugin.rb +1 -1
@@ -50,7 +50,7 @@ module Jekyll def render(context) # If the category is a variable in the current context, expand it - if context.has_key?(@category) + if context.key?(@category) category = context[@category] else category = @category
Signature · 1 line
2.18.1
Quoted 10 lines · Thomas Huth
- Update versions in Gemfile
- "has_key?" has to be renamed to "key?" in category_archive_plugin.rb
- Add .jekyll-cache to .gitignore fileSigned-off-by Thomas Huth <[email protected]>--- .gitignore | 1 + Gemfile | 15 +++------------ _plugins/category_archive_plugin.rb | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-)
[Qemu-devel] action required for qemu-web committers (was Re: [qemu-web RFC PATCH] Update to Jekyll 4.0)
In reply to Thomas HuthQuoted 5 lines · Thomas Huth
- Update versions in Gemfile
- "has_key?" has to be renamed to "key?" in category_archive_plugin.rb
- Add .jekyll-cache to .gitignore fileSigned-off-by Thomas Huth <[email protected]>
The software collections Ruby 2.5 was trivial to setup (patch to the hook after my sig), so I went ahead and pushed this patch. However, I encountered a small snag for which I also had to add the "[PATCH qemu-web] use precompiled sassc" that I have just sent.
Peter/Michael/Thomas, please ssh to qemu.org and do "rm -rf ~/bin ~/.gem" (assuming you don't have any other binary in ~/bin :)). In theory this should not be needed, since bundler is now an RPM and the hook does not add $HOME/bin to the PATH anymore. However, it would be confusing for you to have references to a Ruby installation that does not exist anymore on the machine.
Note that the first time you push to qemu-web.git, you should expect a couple minutes of wait to install the updated gems to your home directory.
Paolo
update renamed from update.old +3 -2
@@ -5,6 +5,8 @@ # # Author: Paolo Bonzini +source scl_source enable rh-ruby25 + # ----------------------------------------------------------------------------- # $DEPLOY_ROOT is the path to the work area for this script. All users # that can push to the repository must have write access to $DEPLOY_ROOT as
@@ -52,8 +54,7 @@ # $DEPLOY_ROOT/root if successful. cd $DEPLOY_ROOT/source -export PATH=$HOME/bin:$PATH -bundle install +bundle install --path $HOME/.gem if bundle exec jekyll build -d $DEPLOY_ROOT/new; then rm -rf $DEPLOY_ROOT/old if test -d $DEPLOY_ROOT/root; then