diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 39 | ||||
| -rw-r--r-- | _config.yml | 7 | ||||
| -rw-r--r-- | _includes/notes.html | 3 | ||||
| -rw-r--r-- | _posts/2020-05-20-makefile-escaping.md | 2 |
6 files changed, 25 insertions, 32 deletions
@@ -1,2 +1,3 @@ +/.jekyll-cache/ _site/ .wget/ @@ -1,10 +1,7 @@ source 'https://rubygems.org' -gem 'jekyll', '~> 3' +gem 'jekyll', '~> 4' gem 'jekyll-github-metadata' gem 'jekyll-paginate' gem 'jekyll-remote-theme' gem 'jekyll-tidy' -# Why is this not a dependency of Jekyll? Considering that without -# kramdown-parser-gfm, Jekyll will error out. -gem 'kramdown-parser-gfm' diff --git a/Gemfile.lock b/Gemfile.lock index 7431c12..e139334 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,30 +9,32 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - faraday (2.5.2) + faraday (2.6.0) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.1) ffi (1.15.5) forwardable-extended (2.6.0) htmlbeautifier (1.4.2) htmlcompressor (0.4.0) http_parser.rb (0.8.0) - i18n (0.9.5) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (3.9.2) + jekyll (4.2.2) 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.17, < 3) + kramdown (~> 2.3) + 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 (~> 2.0) jekyll-github-metadata (2.15.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) @@ -42,8 +44,8 @@ GEM jekyll (>= 3.5, < 5.0) jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) rubyzip (>= 1.3.0, < 3.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (2.2.0) + sassc (> 2.0.1, < 3.0) jekyll-tidy (0.2.2) htmlbeautifier htmlcompressor @@ -58,7 +60,7 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -73,25 +75,24 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) 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) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + terminal-table (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.8.0) PLATFORMS x86_64-linux DEPENDENCIES - jekyll (~> 3) + jekyll (~> 4) jekyll-github-metadata jekyll-paginate jekyll-remote-theme jekyll-tidy - kramdown-parser-gfm BUNDLED WITH 2.3.13 diff --git a/_config.yml b/_config.yml index ff67597..352d373 100644 --- a/_config.yml +++ b/_config.yml @@ -6,16 +6,13 @@ show_drafts: true strict_front_matter: true exclude: - - Gemfile - - Gemfile.lock - Makefile - README.md - - vendor/ collections: notes: output: true - # Jekyll 4.0 or later: + # I want the "natural" sorting (a.k.a. whatever the sort_natural filter does). #sort_by: title defaults: @@ -58,7 +55,7 @@ repository: egor-tensin/blog # jekyll-paginate paginate: 10 # jekyll-remote-theme -remote_theme: egor-tensin/jekyll-theme@2dc87131123afaa1716c87dd02164b33059ad2b8 +remote_theme: egor-tensin/jekyll-theme@425d20d2001d87eff0e6aa3c605bf30ff2063f60 # Theme settings settings: diff --git a/_includes/notes.html b/_includes/notes.html index 4b739af..59173cf 100644 --- a/_includes/notes.html +++ b/_includes/notes.html @@ -1,6 +1,3 @@ -{% comment %} - Sorting can be done in _config.yml with Jekyll 4.0 or later. -{% endcomment %} {% assign note_list = site.notes | sort_natural: 'title' %} <div class="list-group wide-enough"> {% assign h = 'h4' %} diff --git a/_posts/2020-05-20-makefile-escaping.md b/_posts/2020-05-20-makefile-escaping.md index 4190fff..8ee6ec0 100644 --- a/_posts/2020-05-20-makefile-escaping.md +++ b/_posts/2020-05-20-makefile-escaping.md @@ -38,7 +38,7 @@ TL;DR Visit [this page] for an all-in-one Makefile template. {: .alert .alert-info } -[this page]: {{ site.baseurl }}{% link _notes/makefile.md %} +[this page]: {% link _notes/makefile.md %} * Put the prologue above at the top of your Makefile. * Quote command arguments in Makefiles using single quotes `'`. |