Merge pull request #555 from cmbuckley/jekyll-upgrade

Jekyll upgrade

Author: cmbuckley

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 ruby "~> 3.3"
 
-gem 'jekyll', '~> 3.10.0'
+gem 'jekyll', '~> 4.4'
 
 # liquid former stdlibs
 gem 'base64'
@@ -16,7 +16,6 @@ group :jekyll_plugins do
   gem 'jekyll-redirect-from'
   gem 'jekyll-relative-links'
   gem 'jekyll-titles-from-headings'
-  gem 'kramdown-parser-gfm'
 end
 
 group :development, :test do

_ci/fingerprints.sh

@@ -20,6 +20,4 @@ for data in "${files[@]}"; do
     echo "$id: $(md5sum "_site/$file" | cut -c1-8)" >> $fingerprints
 done
 
-sed -i'' "s/fingerprints = '[^']*'/fingerprints = '$(grep -vF . $fingerprints | tr '\n' ',' | sed 's/,$//')'/" _includes/v.html
-
 git add $fingerprints _includes/v.html

_config.yml

@@ -20,7 +20,6 @@ include:
 
 exclude:
   - CNAME
-  - Gemfile
   - LICENCE
   - LICENCE-CODE
   - README.md
@@ -29,7 +28,6 @@ exclude:
   - package.json
   - staticman.yml
   - vendor
-  - node_modules
 
 plugins:
   - jekyll-github-metadata

_data/fingerprints.yml

@@ -3,4 +3,4 @@ icons: 715715b9
 maths: 5414f235
 scripts: 5220ed99
 search: b74b56ab
-style: 1fcbb8ed
+style: 45dfbcc2

_data/global/navigation.yml

@@ -0,0 +1,12 @@
+ - title: Home
+   url: /
+ - title: CV
+   url: /cv/
+ - title: Contact
+   url: /contact/
+ - title: Blog
+   url: /blog/
+ - title: Interests
+   url: /interests/
+ - title: Projects
+   url: /projects/

_data/global/navigation.yml

@@ -0,0 +1,13 @@
+pgp:       2A57 C8E4 6506 FABA
+keybase:   cmbuckley
+hackerone: cmbuckley
+github:    cmbuckley
+linkedin:  cmbuckley
+email:     chris@cmbuckley.co.uk
+x:         _cmbuckley
+facebook:  cmbuckley
+fbid:      61201039
+instagram: c.m.buckley
+amazon:    https://bux.re/amzn
+mastodon:  cmbuckley@mastodon.social
+bsky:      cmbuckley.co.uk

_data/global/social.yml

@@ -7,30 +7,12 @@
         </{{ tag }}>
         <nav class="nav-collapse" aria-label="Menu">
             <ul class="list--inline">
-              {%- if site.data.global.navigation -%}
-                {%- assign navigation = site.data.global.navigation -%}
-              {%- else -%}
-                {%- assign navigation = '' | split: ',' -%}
-
-                {%- capture nav_data -%}
-                {%- include navigation.yml -%}
-                {%- endcapture -%}
-
-                {%- assign nav_array = nav_data | split: ' - ' %}
-                {%- for nav_item in nav_array -%}
-                  {%- if nav_item != '' -%}
-                    {%- assign nav_cleaned = nav_item | strip | replace: 'title: ', '' | replace: '   url: ', '' -%}
-                    {%- assign navigation = navigation | push: nav_cleaned -%}
-                  {%- endif -%}
-                {%- endfor -%}
-              {%- endif -%}
-
               {%- if layout.nav_current or site.nav_current -%}
                 {%- assign url_prefix = layout.nav_current | default: site.nav_current | prepend: '/' -%}
               {%- endif -%}
               {%- assign page_url = page.url | relative_url | prepend: url_prefix -%}
 
-              {%- for link in navigation -%}
+              {%- for link in site.data.global.navigation -%}
                 {%- assign current = false -%}
                 {%- if link.url -%}
                   {%- assign title = link.title -%}