attempt to fix html5validator workflow

Resolves: #28
Potentially resolves: #47

.github/workflows/html5validator.yml

@@ -11,7 +11,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: ".ruby-version"
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Jekyll build

.gitlab-ci.yml

@@ -1,12 +1,17 @@
-# from https://gitlab.com/pages/jekyll/-/blob/master/.gitlab-ci.yml
-image: ruby:latest
+image: alpine:latest
 
 variables:
   JEKYLL_ENV: production
-  LC_ALL: C.UTF-8
+  LC_ALL: en_US.utf8
+  TERM: dumb
+
+cache:
+  paths:
+    - ${PRE_COMMIT_HOME}
+    - ${CI_PROJECT_DIR}/bundle
 
 before_script:
-  - gem install bundler
+  - apk add --no-cache ruby ruby-dev ruby-bundler make gcc g++ musl-dev build-base libffi-dev libxml2-dev
   - bundle install
 
 test:
@@ -28,3 +33,13 @@ pages:
       - public
   rules:
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+
+gitlab-ci-pre-commit:
+  stage: build
+  before_script:
+    - apk add --no-cache python3 python3-dev py3-pip py3-wheel git gcc musl-dev bash nodejs-current npm ruby ruby-bundler
+    - pip install pre-commit --break-system-packages
+  script:
+    - pre-commit run --all-files --show-diff-on-failure
+  variables:
+    PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit

.ruby-version

@@ -0,0 +1 @@
+3.3

Gemfile

@@ -1,6 +1,14 @@
 source "https://rubygems.org"
 # For now this is a GitHub Pages hosted website.
 #   Ref: https://github.com/Mikaela/mikaela.github.io/issues/153
-gem 'github-pages', group: :jekyll_plugins
+#gem "github-pages"
+gem "jekyll"
+# The default theme
+gem "minima"
+# Extensions enabled
+#gem "jekyll-feed"
+#gem "jekyll-mentions"
+gem "jekyll-redirect-from"
+gem "jekyll-sitemap"
 # Required for `bundle exec jekyll serve`
 gem "webrick"

Gemfile.lock

@@ -1,210 +1,66 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.3)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    base64 (0.2.0)
     bigdecimal (3.1.8)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     colorator (1.1.0)
-    commonmarker (0.23.10)
     concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    dnsruby (1.72.1)
-      simpleidn (~> 0.2.1)
-    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.9.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
-      net-http
     ffi (1.16.3)
     forwardable-extended (2.6.0)
-    gemoji (4.1.0)
-    github-pages (231)
-      github-pages-health-check (= 1.18.2)
-      jekyll (= 3.9.5)
-      jekyll-avatar (= 0.8.0)
-      jekyll-coffeescript (= 1.2.2)
-      jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.5)
-      jekyll-feed (= 0.17.0)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.16.1)
-      jekyll-include-cache (= 0.2.1)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.13.0)
-      kramdown (= 2.4.0)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.4)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.30.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.18.2)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (>= 4, < 8)
-      public_suffix (>= 3.0, < 6.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.3)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
+    google-protobuf (4.27.0)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.0-aarch64-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.0-x86-linux)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.0-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.27.0-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.5)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.7, < 2)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.8.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.2.2)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.12)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.5)
-      jekyll (>= 3.0, < 5.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.16.1)
-      jekyll (>= 3.4, < 5.0)
-      octokit (>= 4, < 7, != 4.4.0)
-    jekyll-include-cache (0.2.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-mentions (1.6.0)
-      html-pipeline (~> 2.3)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.3)
-      addressable (~> 2.0)
-      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 (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.6.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.13.0)
-      gemoji (>= 3, < 5)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -213,57 +69,68 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.23.1)
-    mutex_m (0.2.0)
-    net-http (0.4.1)
-      uri
-    nokogiri (1.16.5-x86_64-linux)
-      racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.5)
-    racc (1.8.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rexml (3.2.8)
       strscan (>= 3.0.9)
-    rouge (3.30.0)
-    rubyzip (2.3.2)
+    rouge (4.2.1)
     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)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.3)
+    sass-embedded (1.77.2-aarch64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-aarch64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm-linux-gnueabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm-linux-musleabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-arm64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.2-x86_64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
     strscan (3.1.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (1.8.0)
-    uri (0.13.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
 
 PLATFORMS
-  x86_64-linux
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnueabihf
+  arm-linux-musleabihf
+  arm64-darwin
+  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  github-pages
+  jekyll
+  jekyll-redirect-from
+  jekyll-sitemap
+  minima
   webrick
 
 BUNDLED WITH

README.md

@@ -1,4 +1,8 @@
 ---
+title: suomeksi
+excerpt: "Räätälöimätön kaikki kaikesta versio CVstäni. Kysy
+kohdennetusta versiosta!"
+layout: default
 versionString: 2023.14.0
 date: 2023-04-06 11:01:00 +0300
 categories: cvsuomeksi
@@ -8,6 +12,8 @@ redirect_from:
   - README.html
 ---
 
+# Aminda Suomalainen
+
 <!-- https://workwithcarolyn.com/blog/digital-cv-guide
 Due to having two different language versions, I need to be aware which state particular version is to keep them in sync, I have decided to use CalVer format YYYY.0W.MICRO (year.week.numberofEdit e.g. 2022.01.00).
 
@@ -18,13 +24,17 @@ Internally both of these are provided in the YAML front matter and refer to vari
 
 <!-- _{{ site.biosuomi }}_ -->
 
-_Aminda Suomalainen on avointa lähdekoodia tukeva verkkopalveluylläpitäjä piraattipuolueessa._
+<img src="https://media.githubusercontent.com/media/Mikaela/mikaela.github.io/lfs-media/avatar/250.jpeg" alt="kuva minusta"/>
 
-**_[Google Translated into English](https://cv-aminda-eu.translate.goog/fi/?_x_tr_sl=fi&_x_tr_tl=en&_x_tr_hl=fi&_x_tr_pto=nui), proper [English version is planned](https://github.com/Mikaela/cv/issues/1)._**
+_…on avointa lähdekoodia tukeva verkkopalveluylläpitäjä piraattipuolueessa._
 
-🌍 Helsinki, Suomi / [email](mailto:suomalainen+cvfi@mikaela.info) /
+**_[Google Translated into English](https://cv-aminda-eu.translate.goog/index.html?_x_tr_sl=fi&_x_tr_tl=en) proper [English version is planned](https://github.com/Mikaela/cv/issues/1)._**
+
+🌍 Helsinki, Suomi / [Email](mailto:suomalainen@mikaela.info) /
 [GitHub](https://github.com/Mikaela) / [GitLab.com](https://gitlab.com/Mikaela) /
-[LinkedIn](https://www.linkedin.com/in/mikaelahmsuomalainen/) / [OpenHub](https://www.openhub.net/accounts/Mikaela)
+[LinkedIn](https://www.linkedin.com/in/mikaelahmsuomalainen/) / [Telegram](https://aminda.eu/txt/telegram.txt) / [OpenHub](https://www.openhub.net/accounts/Mikaela) / [Signal](https://signal.me/#eu/yd0IRZ4YzHcSjNLvON2pQcsjUYdQT-nmxb3sGUvRqNMKK3wyQsVCW5FTZcrfX8up)
+
+## Sisällys
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

_config.yml

@@ -1,6 +1,8 @@
-#theme: jekyll-theme-minimal
-title: CV
-description: Aminda Suomalainen, verkkopalveluylläpitäjä/web service administrator
+theme: minima
+title: Curriculum Vitae
+author: Aminda Suomalainen
+description: >
+  Sysadmin
 baseurl: "/" # the subpath of your site, e.g. /blog/
 url: "https://cv.aminda.eu" # the base hostname & protocol for your site
 timezone: Europe/Helsinki
@@ -12,3 +14,6 @@ sitemap:
   file: "/sitemap.xml"
 include: [robots.txt]
 icon: https://media.githubusercontent.com/media/Mikaela/mikaela.github.io/lfs-media/avatar/90.jpeg
+linkedin_username: aminda-eu
+github_username: Mikaela
+email: suomalainen@mikaela.info

_includes/head-custom.html

@@ -1,6 +0,0 @@
-<link rel="icon" href="{{site.icon}}">
-
-{% if page.categories contains "cvsuomeksi" %}
-  <meta name=description" content="{{ site.biosuomi }}" />
-  <meta property="og:description" content="{{ site.biosuomi }}" />
-{% endif %}

_includes/head.html

@@ -0,0 +1,23 @@
+<head>
+  <meta charset="utf-8">
+  <meta name="robots" content="noai">
+  <title>{{site.title}} {{ page.title }} — {{site.author}}</title>
+  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description | nstrip_html | strip_newlines }}{% endif %}">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="referrer" content="no-referrer" />
+  <meta name="og:title" content="{{site.title}} {{ page.title }} — {{site.author}}" />
+  <meta name="og:description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description | nstrip_html | strip_newlines }}{% endif %}" />
+  <meta name="og:site_name" content="{{site.title}} — {{site.author}}" />
+  <meta name="og:image" content="{{site.icon}}"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+  <meta http-equiv="x-dns-prefetch-control" content="off" />
+  <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
+  <link rel="icon" href="{{site.icon}}">
+  <link rel="me" href="{{ site.url }}" />
+  <link rel="me" href="https://aminda.eu" />
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="prefetch" href="https://prefetch.validatorsearch.verisignlabs.com" />
+  <link rel="me" type="application/activity+json" href="https://sauna.social/users/aminda" />
+  <link rel="me" type="application/activity+json" href="https://mastodon.pirateparty.be/users/MikaelaPPFI" />
+</head>

assets/css/style.scss

@@ -1,25 +0,0 @@
----
-# front-matter
----
-
-:root {
-  box-sizing: border-box;
-  color-scheme: dark light;
-  font-family: "Liberation Serif", "Tinos", "Times New Roman", serif;
-  margin: auto;
-  line-height: 1.2;
-  //letter-spacing: 0.5px;
-  // A4 paper
-  max-width: 210mm;
-}
-
-a {
-  text-decoration: underline;
-}
-
-pre,
-code {
-  font-family: "Liberation Mono", "Cousine", "Courier New", monospace;
-  // rem, root element, em, current element
-  font-size: 0.8em;
-}

assets/main.scss

@@ -0,0 +1,42 @@
+---
+# front-matter
+---
+
+@charset "utf-8";
+
+@import "{{ site.theme }}";
+
+:root {
+  color-scheme: dark light !important;
+}
+
+* {
+  //  box-sizing: border-box !important;
+  color: revert !important;
+  background-color: revert !important;
+  font-family: "Liberation Serif", "Tinos", "Times New Roman", serif !important;
+  //margin: auto  !important;
+  //  line-height: 1.2 !important;
+  // A4 paper
+  max-width: 210mm !important;
+  font-size: revert;
+  //padding: auto !important;
+}
+
+a {
+  text-decoration: underline !important;
+}
+
+pre,
+code {
+  font-family: "Liberation Mono", "Cousine", "Courier New", monospace !important;
+  font-size: 0.8em !important;
+}
+
+img {
+  border-radius: 50% !important;
+  margin: 1em !important;
+  @media (min-width: 395px) {
+    float: right !important;
+  }
+}

en/index.md

@@ -1,4 +1,8 @@
 ---
+layout: default
+title: in English
+excerpt: "Untailored everything about everything version of my CV. Ask me
+about a version tailored just for you!"
 versionString: 2023.14.0
 date: null
 categories: cvinenglish