action required for qemu-web committers (was Re: [qemu-web RFC PATCH] Update to Jekyll 4.0)

Commit Message

Paolo Bonzini Sept. 9, 2019, 12:50 p.m. UTC

On 06/09/19 13:06, Thomas Huth wrote:
> - Update versions in Gemfile
> - "has_key?" has to be renamed to "key?" in category_archive_plugin.rb
> - Add .jekyll-cache to .gitignore file
> 
> Signed-off-by: Thomas Huth <[e-mail]>

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

Patch

--- update.old	2019-09-09 08:48:05.947586644 -0400
+++ update	2019-09-09 08:31:05.940274361 -0400
@@ -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