Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Bump bundler version for jekyll and set fix version for jekyll #2794

Merged
merged 1 commit into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
}

"$@"
75 changes: 37 additions & 38 deletions docsite/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -87,51 +87,50 @@ 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)
jekyll
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
Expand Down Expand Up @@ -182,4 +181,4 @@ DEPENDENCIES
unicode-display_width (~> 1.1)

BUNDLED WITH
1.16.2
2.0.1