From 8169e736bb8362f36ebf954efe9fd1f4f67eb216 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 3 Jul 2018 21:57:58 +0200 Subject: [PATCH 01/10] Added javascript runtime Signed-off-by: Jim Martens --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index dbcfc1d..19d3618 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'https://rubygems.org' # gem 'github-pages', group: :jekyll_plugins gem 'activesupport' +gem 'therubyracer' # gem 'github-pages-health-check' gem 'html-proofer', group: :development gem 'jekyll' From 4fc049c4505b6d5880cf033160fa05e53a279337 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 3 Jul 2018 22:25:38 +0200 Subject: [PATCH 02/10] Updated Gemfile.lock Signed-off-by: Jim Martens --- Gemfile.lock | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 46ca2c7..8294c9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GEM tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - autoprefixer-rails (8.5.0) + autoprefixer-rails (8.6.4) execjs bootstrap (4.1.1) autoprefixer-rails (>= 6.0.3) @@ -32,16 +32,16 @@ GEM execjs (2.7.0) extras (0.3.0) forwardable-extended (~> 2.5) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) fastimage (2.1.3) - ffi (1.9.23) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.8.0) + html-pipeline (2.8.3) activesupport (>= 2) nokogiri (>= 1.4) - html-proofer (3.8.0) + html-proofer (3.9.1) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) colorize (~> 0.8) @@ -53,7 +53,7 @@ GEM http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.1) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -91,7 +91,7 @@ GEM rouge (~> 2) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.9.3) + jekyll-feed (0.10.0) jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) @@ -103,7 +103,7 @@ GEM jekyll-paginate (1.1.0) jekyll-readme-index (0.2.0) jekyll (~> 3.0) - jekyll-redirect-from (0.13.0) + jekyll-redirect-from (0.14.0) jekyll (~> 3.3) jekyll-relative-links (0.5.3) jekyll (~> 3.3) @@ -114,11 +114,11 @@ GEM jekyll (~> 3.1) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-swiss (0.4.0) + jekyll-swiss (1.0.0) jekyll-theme-architect (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) @@ -167,7 +167,8 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) - kramdown (1.16.2) + kramdown (1.17.0) + libv8 (3.16.14.19) liquid (4.0.0) liquid-tag-parser (1.9.0) extras (~> 0.3) @@ -184,7 +185,7 @@ GEM jekyll-seo-tag (~> 2.1) minitest (5.11.3) multipart-post (2.0.0) - nokogiri (1.8.2) + nokogiri (1.8.3) mini_portile2 (~> 2.3.0) octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -197,6 +198,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) + ref (2.0.0) rouge (2.2.1) ruby-enum (0.7.2) i18n @@ -211,19 +213,22 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref thread_safe (0.3.6) typhoeus (1.3.0) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.10) + uglifier (4.1.14) execjs (>= 0.3.0, < 3) - unicode-display_width (1.3.2) + unicode-display_width (1.4.0) yell (2.0.7) PLATFORMS @@ -276,6 +281,7 @@ DEPENDENCIES rouge sprockets terminal-table + therubyracer uglifier BUNDLED WITH From db8b8dfd64834cf53339555ffe3858c0a9a366fa Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 3 Jul 2018 22:33:34 +0200 Subject: [PATCH 03/10] Set the localization to US UTF8 Signed-off-by: Jim Martens --- .drone.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 85cb91a..7d7c463 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,9 @@ pipeline: image: ruby environment: - BUNDLE_PATH=/drone/.bundle - commands: + - LANG="en_US.UTF-8" + - LC_ALL="en_US.UTF-8" + commands: - bundle install - JEKYLL_ENV=production bundle exec jekyll build && bundle exec htmlproofer _site/ --disable-external rebuild-cache: From cbb222b76f5443fbfd2357df126b9306a70b4e71 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 08:59:58 +0200 Subject: [PATCH 04/10] Added encoding to config file Signed-off-by: Jim Martens --- _config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 87a8002..42d72f3 100644 --- a/_config.yml +++ b/_config.yml @@ -14,6 +14,7 @@ description: > # this means to ignore newlines until "baseurl:" baseurl: "" # the subpath of your site, e.g. /blog url: "https://2martens.de" # the base hostname & protocol for your site timezone: "Europe/Berlin" +encoding: utf-8 collections: events: output: true @@ -53,4 +54,4 @@ exclude: - deploy_ed25519.enc - LICENSE - vendor - - node_modules \ No newline at end of file + - node_modules From ed27ffea3f28f1d7d2b80223dd6661003dc692ec Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 09:46:25 +0200 Subject: [PATCH 05/10] Updated locale env variables for drone Signed-off-by: Jim Martens --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7d7c463..a00a909 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,9 @@ pipeline: image: ruby environment: - BUNDLE_PATH=/drone/.bundle - - LANG="en_US.UTF-8" - - LC_ALL="en_US.UTF-8" + - LANG="C.UTF-8" + - LC_ALL="C.UTF-8" + - LANGUAGE="C.UTF-8" commands: - bundle install - JEKYLL_ENV=production bundle exec jekyll build && bundle exec htmlproofer _site/ --disable-external From 4e3a60abb0aa6d1b5838990a07c955f9936f85d9 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 10:06:38 +0200 Subject: [PATCH 06/10] Moved lang env variables to command section and added debug command Signed-off-by: Jim Martens --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index a00a909..9570f24 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,10 +11,10 @@ pipeline: image: ruby environment: - BUNDLE_PATH=/drone/.bundle - - LANG="C.UTF-8" - - LC_ALL="C.UTF-8" - - LANGUAGE="C.UTF-8" commands: + - export LANG="C.UTF-8" + - export LC_ALL="C.UTF-8" + - ruby -e 'puts STDIN.external_encoding' # figure out the encoding used - bundle install - JEKYLL_ENV=production bundle exec jekyll build && bundle exec htmlproofer _site/ --disable-external rebuild-cache: From 0c1814429db303eafd1b8b22e4d67c4b9fea17c5 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 10:18:05 +0200 Subject: [PATCH 07/10] Replaced move commands with copy Signed-off-by: Jim Martens --- .drone.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9570f24..04c4a7d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,10 +35,12 @@ pipeline: delete: true secrets: [ rsync_key ] script: + - shopt -s dotglob - rm -rf tmp/old.build - mkdir tmp/old.build - - mv html/{.,}* tmp/old.build/ - - mv tmp/build/{.,}* html/ + - cp -r html/* tmp/old.build/ + - rm -rf html/* + - cp -r tmp/build/* html/ - rm -rf tmp/build notify: image: drillster/drone-email From c9400e4f3a1ad76e7420d14a0310e1a5933c8b13 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 10:20:28 +0200 Subject: [PATCH 08/10] Fixed source Signed-off-by: Jim Martens --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 04c4a7d..327a017 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,7 +29,7 @@ pipeline: image: drillster/drone-rsync hosts: [ "wolf.uberspace.de" ] user: martens7 - source: ./_site + source: ./_site/* target: ~/tmp/build recursive: true delete: true From 123cedf76c9afffcd5ab108d7bcae3bbe94d3aab Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 10:25:41 +0200 Subject: [PATCH 09/10] Fixed non-transfer of hidden files Signed-off-by: Jim Martens --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 327a017..6c9fbff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,7 +29,7 @@ pipeline: image: drillster/drone-rsync hosts: [ "wolf.uberspace.de" ] user: martens7 - source: ./_site/* + source: ./_site/. target: ~/tmp/build recursive: true delete: true From 7beb79d7dcc1dc8958b18a11cc0a6b2c3a5f37cb Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 4 Jul 2018 10:29:29 +0200 Subject: [PATCH 10/10] Wortprotokoll von erster Junisitzung des G20-SOA verlinkt Signed-off-by: Jim Martens --- _posts/2018-06-17-bericht-g20-sonderausschuss-09.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/_posts/2018-06-17-bericht-g20-sonderausschuss-09.markdown b/_posts/2018-06-17-bericht-g20-sonderausschuss-09.markdown index 6a5a503..b23d9fc 100644 --- a/_posts/2018-06-17-bericht-g20-sonderausschuss-09.markdown +++ b/_posts/2018-06-17-bericht-g20-sonderausschuss-09.markdown @@ -14,6 +14,7 @@ verwiesen. Dieser Bericht schildert meine Eindrücke und beschränkt sich auf einige Kernelemente und Schlussfolgerungen meinerseits. Tagesordnung +Wortprotokoll ## Reaktion auf öffentliche Anhörung