From a650fd8553b1ee0c5ff68be22c2de5562bcbc31a Mon Sep 17 00:00:00 2001 From: Mateusz Szostok Date: Fri, 8 May 2020 20:27:09 +0200 Subject: [PATCH] Bump bundler version for jekyll and set fix version for jekyll --- build/docs.sh | 4 +-- docsite/Gemfile.lock | 75 ++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/build/docs.sh b/build/docs.sh index cc751b193c5..91bc95fe245 100755 --- a/build/docs.sh +++ b/build/docs.sh @@ -36,7 +36,7 @@ preview() { -v $DOCSITE:/srv/jekyll \ -v $REPO_ROOT/docs:/srv/docs \ -v $DOCSITE/.bundler:/usr/local/bundle \ - -p 4000:4000 jekyll/jekyll jekyll serve + -p 4000:4000 jekyll/jekyll:4.0 jekyll serve } # Generate the static site's content @@ -48,7 +48,7 @@ generate() { -v $DOCSITE:/srv/jekyll \ -v $REPO_ROOT/docs:/srv/docs \ -v $DOCSITE/.bundler:/usr/local/bundle \ - jekyll/jekyll /bin/bash -c "bundle install; jekyll build" + jekyll/jekyll:4.0 /bin/bash -c "bundle install; jekyll build" } "$@" diff --git a/docsite/Gemfile.lock b/docsite/Gemfile.lock index a65486d005d..2f2ad809f8f 100644 --- a/docsite/Gemfile.lock +++ b/docsite/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) coderay (1.1.2) coffee-script (2.4.1) coffee-script-source @@ -12,9 +12,9 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) execjs (2.7.0) - faraday (0.15.4) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.10.0) + ffi (1.12.2) forwardable-extended (2.6.0) jekyll (3.6.3) addressable (~> 2.4) @@ -27,8 +27,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 3) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) coffee-script-source (~> 1.12) @@ -38,24 +38,24 @@ GEM jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.12.1) - jekyll (~> 3.4) + jekyll-github-metadata (2.13.0) + jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) jekyll-include-cache (0.1.0) jekyll (~> 3.3) - jekyll-optional-front-matter (0.3.0) - jekyll (~> 3.0) + jekyll-optional-front-matter (0.3.2) + jekyll (>= 3.0, < 5.0) jekyll-paginate (1.1.0) jekyll-readme-index (0.0.3) jekyll (~> 3.0) - jekyll-redirect-from (0.15.0) + jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) jekyll-relative-links (0.5.3) jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) jekyll-sitemap (1.2.0) jekyll (~> 3.3) jekyll-swiss (0.4.0) @@ -77,8 +77,8 @@ GEM jekyll (~> 3.3) jekyll-theme-modernist (0.0.3) jekyll (~> 3.3) - jekyll-theme-primer (0.5.3) - jekyll (~> 3.5) + jekyll-theme-primer (0.5.4) + jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) jekyll-theme-slate (0.0.3) @@ -87,8 +87,8 @@ GEM jekyll (~> 3.3) jekyll-theme-time-machine (0.0.3) jekyll (~> 3.3) - jekyll-titles-from-headings (0.5.1) - jekyll (~> 3.3) + jekyll-titles-from-headings (0.5.3) + jekyll (>= 3.3, < 5.0) jekyll-watch (1.5.1) listen (~> 3.0) jekyll-youtube (1.0.0) @@ -96,42 +96,41 @@ GEM json (1.8.6) kramdown (1.17.0) liquid (4.0.3) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - method_source (0.9.2) - minima (2.5.0) - jekyll (~> 3.5) + method_source (1.0.0) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - multipart-post (2.0.0) - octokit (4.14.0) + multipart-post (2.1.1) + octokit (4.18.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (3.0.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (3.1.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) rouge (2.2.1) - ruby_dep (1.5.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) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.5.0) + unicode-display_width (1.7.0) PLATFORMS ruby @@ -182,4 +181,4 @@ DEPENDENCIES unicode-display_width (~> 1.1) BUNDLED WITH - 1.16.2 + 2.0.1