* [Qemu-devel] [qemu-web RFC PATCH] Update to Jekyll 4.0
@ 2019-09-06 11:06 Thomas Huth
2019-09-09 12:31 ` Stefan Hajnoczi
2019-09-09 12:50 ` [Qemu-devel] action required for qemu-web committers (was Re: [qemu-web RFC PATCH] Update to Jekyll 4.0) Paolo Bonzini
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2019-09-06 11:06 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel, Stefan Hajnoczi; +Cc: alex.bennee, mdroth
- 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 <thuth@redhat.com>
---
.gitignore | 1 +
Gemfile | 15 +++------------
_plugins/category_archive_plugin.rb | 2 +-
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
index c744144..3b93b88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/Gemfile.lock
/vendor
/.bundle
+/.jekyll-cache
diff --git a/Gemfile b/Gemfile
index b01dff9..200f2c4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/_plugins/category_archive_plugin.rb b/_plugins/category_archive_plugin.rb
index c2d8b29..5f26aad 100644
--- a/_plugins/category_archive_plugin.rb
+++ b/_plugins/category_archive_plugin.rb
@@ -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
--
2.18.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [qemu-web RFC PATCH] Update to Jekyll 4.0
2019-09-06 11:06 [Qemu-devel] [qemu-web RFC PATCH] Update to Jekyll 4.0 Thomas Huth
@ 2019-09-09 12:31 ` Stefan Hajnoczi
2019-09-09 12:50 ` [Qemu-devel] action required for qemu-web committers (was Re: [qemu-web RFC PATCH] Update to Jekyll 4.0) Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2019-09-09 12:31 UTC (permalink / raw)
To: Thomas Huth; +Cc: Paolo Bonzini, alex.bennee, qemu-devel, mdroth
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
On Fri, Sep 06, 2019 at 01:06:49PM +0200, 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 <thuth@redhat.com>
> ---
> .gitignore | 1 +
> Gemfile | 15 +++------------
> _plugins/category_archive_plugin.rb | 2 +-
> 3 files changed, 5 insertions(+), 13 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] action required for qemu-web committers (was Re: [qemu-web RFC PATCH] Update to Jekyll 4.0)
2019-09-06 11:06 [Qemu-devel] [qemu-web RFC PATCH] Update to Jekyll 4.0 Thomas Huth
2019-09-09 12:31 ` Stefan Hajnoczi
@ 2019-09-09 12:50 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2019-09-09 12:50 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Stefan Hajnoczi
Cc: Peter Maydell, alex.bennee, Michael Roth
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 <thuth@redhat.com>
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.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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-09 12:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-06 11:06 [Qemu-devel] [qemu-web RFC PATCH] Update to Jekyll 4.0 Thomas Huth
2019-09-09 12:31 ` Stefan Hajnoczi
2019-09-09 12:50 ` [Qemu-devel] action required for qemu-web committers (was Re: [qemu-web RFC PATCH] Update to Jekyll 4.0) Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).