build: moved to jekyll-pug (from jekyll-bliss)

Author: ErikBjare

.github/workflows/pages.yml

@@ -29,9 +29,10 @@ jobs:
           python-version: ${{ matrix.python_version }}
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
 
       - name: Install poetry & create virtualenv
         shell: bash
@@ -41,8 +42,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo npm install --global pug pug-cli jekyll-bliss
-          gem update --system
+          sudo npm install --global pug pug-cli
           make install-deps
 
       - name: Get latest releases

Gemfile

@@ -3,6 +3,12 @@ source "https://rubygems.org/"
 gem 'jekyll', '~>4.0'
 
 group :jekyll_plugins do
-  #gem 'jekyll-pug'
   gem 'jekyll-last-modified-at'
+
+  gem "jekyll-redirect-from", "~> 0.16.0"
+
+  gem 'jekyll-pug'
+
+  gem 'jekyll-feed'
 end
+

Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
+    execjs (2.8.1)
     ffi (1.13.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
@@ -29,9 +30,16 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 1.8)
+    jekyll-feed (0.16.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-last-modified-at (1.3.0)
       jekyll (>= 3.7, < 5.0)
       posix-spawn (~> 0.3.9)
+    jekyll-pug (1.5.6)
+      jekyll (>= 3.6, < 5.0)
+      pug-ruby (~> 2.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
@@ -44,14 +52,22 @@ GEM
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    memoist (0.16.2)
     mercenary (0.4.0)
+    method-not-implemented (1.0.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     posix-spawn (0.3.15)
     public_suffix (4.0.6)
+    pug-ruby (2.0.1)
+      execjs (~> 2.0)
+      memoist (~> 0.15)
+      method-not-implemented (~> 1.0, >= 1.0.1)
+      regexp-match-polyfill (~> 1.0, >= 1.0.2)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp-match-polyfill (1.0.2)
     rexml (3.2.5)
     rouge (3.21.0)
     safe_yaml (1.0.5)
@@ -66,7 +82,10 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll (~> 4.0)
+  jekyll-feed
   jekyll-last-modified-at
+  jekyll-pug
+  jekyll-redirect-from (~> 0.16.0)
 
 BUNDLED WITH
    2.1.0

Makefile

@@ -2,19 +2,19 @@
 
 build: assets
 	# compass compile
-	bundle exec bliss build
+	bundle exec jekyll build
 
 dev: assets
-	bundle exec bliss serve
+	bundle exec jekyll serve
 
 assets: _includes/tables img/stats img/*.png
 
 update-downloads:
 	python3 scripts/update-downloads.py
 
 install-deps:
-	-sudo npm install -g jekyll-bliss
-	bundle config set path 'vendor/bundle'
+	# This shouldn't be set in CI, but it's maybe (?) useful for local development
+	#bundle config set path 'vendor/bundle'
 	bundle install
 
 precommit:

_config.yml

@@ -20,6 +20,9 @@ sass:
 
 plugins:
  - jekyll-last-modified-at
+ - jekyll-redirect-from
+ - jekyll-pug
+ - jekyll-feed
 
 jekyll-bliss:
   build-folder: _build

_includes/head.pug

@@ -21,7 +21,7 @@ head
   link(href='https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', rel='stylesheet', integrity='sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN', crossorigin='anonymous')
 
   // Google Analytics
-  | {% include analytics.html %}
+  | {% include analytics.pug %}
   //script
     |(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     |(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

_layouts/default.pug

@@ -1,9 +1,9 @@
 doctype html
 html
-  | {% include head.html %}
+  | {% include head.pug %}
   body
-    | {% include header.html %}
+    | {% include header.pug %}
     div.page-content
       div
         | {{ content }}
-    | {% include footer.html %}
+    | {% include footer.pug %}

index.pug

@@ -13,7 +13,7 @@ article.wrapper.mt-4
 
   .mb-5.mt-2
     .mb-2
-      | {% include download-button.html %}
+      | {% include download-button.pug %}
       a.mr-2.mb-2.btn.btn-primary(href='https://docs.activitywatch.net/en/latest/getting-started.html', target="_blank", style="vertical-align: top")
         i.fa.fa-question-circle.mr-2
         | Getting started guide