diff --git a/.drone.yml b/.drone.yml index 85cb91a..6c9fbff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,10 @@ pipeline: image: ruby environment: - BUNDLE_PATH=/drone/.bundle - commands: + 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: @@ -26,16 +29,18 @@ pipeline: image: drillster/drone-rsync hosts: [ "wolf.uberspace.de" ] user: martens7 - source: ./_site + source: ./_site/. target: ~/tmp/build recursive: true 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 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' 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 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 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