From 81e920ac993fe240bc109594186fea1debac9393 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 3 Nov 2020 13:53:56 +0000 Subject: [PATCH 1/5] chore(deps): update dependency jekyll to v4 --- Gemfile | 2 +- Gemfile.lock | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index b9c3625f..cab83241 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.5" +gem "jekyll", "~> 4.1.0" # gem "html-proofer" # This is the default theme for new Jekyll sites. You may change this to anything you like. # gem "minima", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 237437dc..ad1161df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,64 +5,70 @@ GEM public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) concurrent-ruby (1.1.7) - em-websocket (0.5.1) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) ffi (1.13.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) - jekyll (3.8.7) + jekyll (4.1.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) + terminal-table (~> 1.8) jekyll-feed (0.15.0) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (2.1.0) + sassc (> 2.0.1, < 3.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.5) + public_suffix (4.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.22.0) + rexml (3.2.4) + rouge (3.24.0) 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) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.5) + jekyll (~> 4.1.0) jekyll-feed (~> 0.6) jekyll-paginate jekyll-redirect-from (~> 0.14) From c3bb6ddc874696ee35207adb3f288887fea78509 Mon Sep 17 00:00:00 2001 From: Dennis Ostendorf Date: Wed, 4 Nov 2020 11:16:52 +0100 Subject: [PATCH 2/5] ci: create directory needed for docker --- .gitignore | 2 +- .jekyll-cache/.gitignore | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .jekyll-cache/.gitignore diff --git a/.gitignore b/.gitignore index b6d7d299..acd553d1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ node_modules npm-debug.log .sass-cache _site/ -.jekyll-cache/ +# .jekyll-cache/ .jekyll-metadata # Logs logs diff --git a/.jekyll-cache/.gitignore b/.jekyll-cache/.gitignore new file mode 100644 index 00000000..3bd76277 --- /dev/null +++ b/.jekyll-cache/.gitignore @@ -0,0 +1,4 @@ +# ignore everything in this directory +* +#except the gitignore file itself +!.gitignore \ No newline at end of file From 26e20a131247a2ef33c8bb358525066e2255a65f Mon Sep 17 00:00:00 2001 From: Dennis Ostendorf Date: Wed, 4 Nov 2020 11:22:38 +0100 Subject: [PATCH 3/5] ci: move .jekyll-cache to source directory --- {.jekyll-cache => source/.jekyll-cache}/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.jekyll-cache => source/.jekyll-cache}/.gitignore (100%) diff --git a/.jekyll-cache/.gitignore b/source/.jekyll-cache/.gitignore similarity index 100% rename from .jekyll-cache/.gitignore rename to source/.jekyll-cache/.gitignore From 6d52bde2af82683ac8fedf5e94adcbe738478272 Mon Sep 17 00:00:00 2001 From: Dennis Ostendorf Date: Wed, 4 Nov 2020 11:50:09 +0100 Subject: [PATCH 4/5] ci: trace jekyll build in docker --- .github/workflows/jekyll-build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/jekyll-build.yml b/.github/workflows/jekyll-build.yml index 98f8c97d..d9272564 100644 --- a/.github/workflows/jekyll-build.yml +++ b/.github/workflows/jekyll-build.yml @@ -2,19 +2,18 @@ name: Jekyll site Build on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: build: - runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip ci')" steps: - - uses: actions/checkout@v2 - - name: Build the site in the jekyll/builder container - run: | - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" + - uses: actions/checkout@v2 + - name: Build the site in the jekyll/builder container + run: | + docker run \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future --trace" From 8bbeb39af6e633480223f0665473a39e67411ca4 Mon Sep 17 00:00:00 2001 From: Dennis Ostendorf Date: Wed, 4 Nov 2020 12:01:57 +0100 Subject: [PATCH 5/5] ci: create volume for .jekyll-cache --- .github/workflows/jekyll-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jekyll-build.yml b/.github/workflows/jekyll-build.yml index d9272564..711c94dc 100644 --- a/.github/workflows/jekyll-build.yml +++ b/.github/workflows/jekyll-build.yml @@ -15,5 +15,5 @@ jobs: - name: Build the site in the jekyll/builder container run: | docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ + -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site -v ${{ github.workspace }}/source/.jekyll-cache:/srv/jekyll/.jekyll-cache \ jekyll/builder:latest /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future --trace"