From 04870f47b3ccb8d2d61b0baf8dab0a62efcf0cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Baldassari?= <francois@memfault.io>
Date: Fri, 13 Nov 2020 23:03:44 -0800
Subject: [PATCH] Update Jekyll, add native liquid builder for faster build
times
---
.gitignore | 2 ++
Gemfile | 3 ++-
Gemfile.lock | 69 +++++++++++++++++++++++++++++-----------------------
readme.md | 2 +-
4 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6e98911e..61b8cc88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ _site
vendor
example/*/build
.venv
+.jekyll-cache
+.jekyll-metadata
diff --git a/Gemfile b/Gemfile
index 7b09c01b..d632b712 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
# gem "rails"
-gem "jekyll", "~> 3.8"
+gem "jekyll", "~> 4.1.1"
gem "jekyll-paginate", "~> 1.1"
gem "jekyll-feed", "~> 0.12.1"
@@ -17,3 +17,4 @@ group :jekyll_plugins do
end
gem "jekyll-target-blank", "~> 2.0"
+gem "liquid-c"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c1ac0b8..6d211304 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,39 +1,41 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
- concurrent-ruby (1.1.5)
- em-websocket (0.5.1)
+ concurrent-ruby (1.1.7)
+ em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
- ffi (1.10.0)
+ ffi (1.13.1)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
- i18n (0.9.5)
+ i18n (1.8.5)
concurrent-ruby (~> 1.0)
- jekyll (3.8.5)
+ jekyll (4.1.1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
- i18n (~> 0.7)
- jekyll-sass-converter (~> 1.0)
+ i18n (~> 1.0)
+ jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
- kramdown (~> 1.14)
+ kramdown (~> 2.1)
+ kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
- mercenary (~> 0.3.3)
+ mercenary (~> 0.4.0)
pathutil (~> 0.9)
- rouge (>= 1.7, < 4)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
+ terminal-table (~> 1.8)
jekyll-diagrams (0.10.0)
jekyll (>= 3.8, < 5.0)
jekyll-feed (0.12.1)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
- jekyll-sass-converter (1.5.2)
- sass (~> 3.4)
+ jekyll-sass-converter (2.1.0)
+ sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-target-blank (2.0.0)
@@ -41,41 +43,46 @@ GEM
nokogiri (~> 1.10)
jekyll-watch (2.2.1)
listen (~> 3.0)
- kramdown (1.17.0)
+ kramdown (2.3.0)
+ rexml
+ kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
liquid (4.0.3)
- listen (3.1.5)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- ruby_dep (~> 1.2)
- mercenary (0.3.6)
+ liquid-c (4.0.0)
+ liquid (>= 3.0.0)
+ listen (3.3.1)
+ rb-fsevent (~> 0.10, >= 0.10.3)
+ rb-inotify (~> 0.9, >= 0.9.10)
+ mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.0.3)
- rb-fsevent (0.10.3)
- rb-inotify (0.10.0)
+ public_suffix (4.0.6)
+ rb-fsevent (0.10.4)
+ rb-inotify (0.10.1)
ffi (~> 1.0)
- rouge (3.20.0)
- ruby_dep (1.5.0)
+ rexml (3.2.4)
+ rouge (3.25.0)
safe_yaml (1.0.5)
- sass (3.7.4)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
+ sassc (2.4.0)
+ ffi (~> 1.9)
+ terminal-table (1.8.0)
+ unicode-display_width (~> 1.1, >= 1.1.1)
+ unicode-display_width (1.7.0)
PLATFORMS
ruby
DEPENDENCIES
- jekyll (~> 3.8)
+ jekyll (~> 4.1.1)
jekyll-diagrams
jekyll-feed (~> 0.12.1)
jekyll-paginate (~> 1.1)
jekyll-seo-tag (~> 2.6.1)
jekyll-target-blank (~> 2.0)
+ liquid-c
BUNDLED WITH
2.1.4
diff --git a/readme.md b/readme.md
index 1d95ea99..c8858b33 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@ Clone the repo, install dependencies, and serve:
$ git clone https://github.com/memfault/interrupt.git
$ cd interrupt
$ bundle install
-$ bundle exec jekyll serve -D
+$ bundle exec jekyll serve -D --incremental
```
## Acknowledgements