From 49b7c1520145c3e4d7fb0894b25a4a56e7b7044d Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 12 Jan 2021 20:27:59 +0100 Subject: [PATCH 1/9] Enable Brotli compression - Compress file AOD. - Let the server only use static files. - Don't add github-pages to jekyll-plugins group, due to the fact github-pages will behave differently when enabling production ENV. - Adds an extra 10s for the `host` to use `./buid.sh` due to compressing all files. - Resolves #2186 --- Gemfile | 8 +++----- Gemfile.lock | 21 +++++++++++++++------ _config.yml | 2 ++ build.sh | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 70f8d954..72cf17ef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,10 @@ source "https://rubygems.org" # Install github-pages gem (https://jekyllrb.com/docs/github-pages/) -gem "github-pages", group: :jekyll_plugins +gem "github-pages" -# Plugins -group :jekyll_plugins do - # example: gem "jekyll-feed", "~> 0.6" -end +# Install jekyll-brotli gem (https://github.com/philnash/jekyll-brotli/) +gem 'jekyll-brotli' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock index 9caae865..94039853 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,7 @@ GEM zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) + brotli (0.2.3) coffee-script (2.4.1) coffee-script-source execjs @@ -26,9 +27,11 @@ GEM ffi (>= 1.3.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.2.0) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords + faraday-net_http (1.0.1) ffi (1.14.2) forwardable-extended (2.6.0) gemoji (3.0.1) @@ -103,6 +106,9 @@ GEM safe_yaml (~> 1.0) jekyll-avatar (0.7.0) jekyll (>= 3.0, < 5.0) + jekyll-brotli (2.2.1) + brotli (~> 0.2.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) @@ -203,21 +209,23 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.2) + minitest (5.14.3) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.1.1) + racc (1.5.2) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -256,6 +264,7 @@ PLATFORMS DEPENDENCIES github-pages + jekyll-brotli tzinfo-data BUNDLED WITH diff --git a/_config.yml b/_config.yml index 25a9c243..41af1412 100644 --- a/_config.yml +++ b/_config.yml @@ -6,7 +6,9 @@ production_url: "https://www.privacytools.io" sass: style: compressed plugins: + - github-pages - jekyll-sitemap + - jekyll-brotli sitemap: file: "/sitemap.xml" include: [".well-known"] diff --git a/build.sh b/build.sh index f17060a4..75dbd529 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env sh set -e # halt script on error -bundle exec jekyll build +JEKYLL_ENV=production bundle exec jekyll build \ No newline at end of file From 215ae3d82110de2c06b42bd499465865cb270c52 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 12 Jan 2021 22:30:31 +0100 Subject: [PATCH 2/9] New line --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 75dbd529..ae4acd74 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env sh set -e # halt script on error -JEKYLL_ENV=production bundle exec jekyll build \ No newline at end of file +JEKYLL_ENV=production bundle exec jekyll build From b84a778e156a4a8c1334e1aec194917c9338d9a7 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 14:21:39 -0600 Subject: [PATCH 3/9] Specify .ruby-version, update development instructions --- .ruby-version | 1 + README.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..097a15a2 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.2 diff --git a/README.md b/README.md index cacbb5bf..243281f4 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,10 @@ If you want to discuss privacy in general, a new tool, or just something else, f ## Developing -1. Install the latest stable version of [Ruby](https://www.ruby-lang.org/en/downloads/). +1. Install the version of [Ruby](https://www.ruby-lang.org/en/downloads/) currently specified by [`.ruby-version`](.ruby-version) + * With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install` + * With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"` + * [Manually](https://www.ruby-lang.org/en/downloads/) 1. Install [Bundler](https://bundler.io/) v2.0.1: * `gem install bundler -v 2.0.1` 1. Install the required dependencies: From bc51ff101ae9ca2c70c357b7176ac8f363061d42 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 14:22:03 -0600 Subject: [PATCH 4/9] Switch from github-pages gem to jekyll gem --- Gemfile | 21 +++++- Gemfile.lock | 204 +-------------------------------------------------- _config.yml | 1 - 3 files changed, 21 insertions(+), 205 deletions(-) diff --git a/Gemfile b/Gemfile index 72cf17ef..d4074100 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,27 @@ source "https://rubygems.org" -# Install github-pages gem (https://jekyllrb.com/docs/github-pages/) -gem "github-pages" +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +gem "jekyll", "~> 3.9.0" # Install jekyll-brotli gem (https://github.com/philnash/jekyll-brotli/) -gem 'jekyll-brotli' +# If you have any plugins, put them here! +group :jekyll_plugins do + gem "jekyll-brotli", "~> 2.2.1" + gem "jekyll-sitemap", "~> 1.4.0" +end + +# Jekyll 3.9.0 now requires this explicitly installed, apparently +gem "kramdown-parser-gfm", "~> 1.1.0" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.0" if Gem.win_platform? - diff --git a/Gemfile.lock b/Gemfile.lock index 94039853..421fa04c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,93 +1,17 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) brotli (0.2.3) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) concurrent-ruby (1.1.7) - dnsruby (1.61.5) - simpleidn (~> 0.1) em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) ffi (1.14.2) forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (209) - github-pages-health-check (= 1.16.1) - jekyll (= 3.9.0) - jekyll-avatar (= 0.7.0) - jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.15.1) - jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.13.0) - jekyll-mentions (= 1.6.0) - jekyll-optional-front-matter (= 0.3.2) - jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.3.0) - jekyll-redirect-from (= 0.16.0) - jekyll-relative-links (= 0.6.1) - jekyll-remote-theme (= 0.4.2) - jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.6.1) - jekyll-sitemap (= 1.4.0) - jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.2) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) - jekyll-titles-from-headings (= 0.5.3) - jemoji (= 0.12.0) - kramdown (= 2.3.0) - kramdown-parser-gfm (= 1.1.0) - liquid (= 4.0.3) - mercenary (~> 0.3) - minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.23.0) - terminal-table (~> 1.4) - github-pages-health-check (1.16.1) - addressable (~> 2.3) - dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (~> 3.0) - typhoeus (~> 1.3) - html-pipeline (2.14.0) - activesupport (>= 2) - nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -104,102 +28,15 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.7.0) - jekyll (>= 3.0, < 5.0) jekyll-brotli (2.2.1) brotli (~> 0.2.0) jekyll (>= 3.0, < 5.0) - jekyll-coffeescript (1.1.1) - coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) - rouge (>= 2.0, < 4.0) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.15.1) - jekyll (>= 3.7, < 5.0) - jekyll-gist (1.5.0) - octokit (~> 4.2) - jekyll-github-metadata (2.13.0) - jekyll (>= 3.4, < 5.0) - octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.6.0) - html-pipeline (~> 2.3) - jekyll (>= 3.7, < 5.0) - jekyll-optional-front-matter (0.3.2) - jekyll (>= 3.0, < 5.0) - jekyll-paginate (1.1.0) - jekyll-readme-index (0.3.0) - jekyll (>= 3.0, < 5.0) - jekyll-redirect-from (0.16.0) - jekyll (>= 3.3, < 5.0) - jekyll-relative-links (0.6.1) - jekyll (>= 3.3, < 5.0) - jekyll-remote-theme (0.4.2) - addressable (~> 2.0) - jekyll (>= 3.5, < 5.0) - jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) - rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) - jekyll-swiss (1.0.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.2) - jekyll (> 3.5, < 5.0) - jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - 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.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.3) - jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.12.0) - gemoji (~> 3.0) - html-pipeline (~> 2.2) - jekyll (>= 3.0, < 5.0) kramdown (2.3.0) rexml kramdown-parser-gfm (1.1.0) @@ -209,62 +46,29 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.5.0) - minima (2.5.1) - jekyll (>= 3.5, < 5.0) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - minitest (5.14.3) - multipart-post (2.1.1) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.1.1) - racc (1.5.2) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) rouge (3.23.0) - ruby-enum (0.8.0) - i18n - ruby2_keywords (0.0.2) - rubyzip (2.3.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.2) - addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - simpleidn (0.1.1) - unf (~> 0.1.4) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - github-pages - jekyll-brotli + jekyll (~> 3.9.0) + jekyll-brotli (~> 2.2.1) + jekyll-sitemap (~> 1.4.0) + kramdown-parser-gfm (~> 1.1.0) tzinfo-data BUNDLED WITH diff --git a/_config.yml b/_config.yml index 41af1412..4a33fb8d 100644 --- a/_config.yml +++ b/_config.yml @@ -6,7 +6,6 @@ production_url: "https://www.privacytools.io" sass: style: compressed plugins: - - github-pages - jekyll-sitemap - jekyll-brotli sitemap: From eb0ffd22587d0ea97a17b536f241db8c715273a1 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 14:26:54 -0600 Subject: [PATCH 5/9] Upgrade bundler Locking to 2.0.1 was a necessary workaround for a Netlify bug which has finally been resolved. --- Gemfile.lock | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 421fa04c..6ee16ff0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,4 +72,4 @@ DEPENDENCIES tzinfo-data BUNDLED WITH - 2.0.1 + 2.2.5 diff --git a/README.md b/README.md index 243281f4..ab807830 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ If you want to discuss privacy in general, a new tool, or just something else, f * With [rbenv](https://github.com/rbenv/rbenv) (**recommended!**): `rbenv install` * With [RVM](https://rvm.io): `rvm install "ruby-$(cat .ruby-version)"` * [Manually](https://www.ruby-lang.org/en/downloads/) -1. Install [Bundler](https://bundler.io/) v2.0.1: - * `gem install bundler -v 2.0.1` +1. Install [Bundler](https://bundler.io/) v2.2.5: + * `gem install bundler:2.2.5` 1. Install the required dependencies: * `bundle install` 1. Build the website (the output can be found in the `_site` directory): From 3aee1ee365c88179703d8efe477c8320713adda0 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 14:34:41 -0600 Subject: [PATCH 6/9] Update dependencies --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6ee16ff0..db59cba1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,18 +42,18 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.3.3) + listen (3.4.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.1.1) + public_suffix (4.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.23.0) + rouge (3.26.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) From 0b31c37f99f9eb46e5015e4df631a1b49895963d Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 14:42:05 -0600 Subject: [PATCH 7/9] Update to Ruby 3.0.0 --- .ruby-version | 2 +- Gemfile | 11 ++++++----- Gemfile.lock | 10 ++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.ruby-version b/.ruby-version index 097a15a2..4a36342f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.2 +3.0.0 diff --git a/Gemfile b/Gemfile index d4074100..ad86f80f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,20 +8,21 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.9.0" +gem "jekyll", "~> 3.9" # Install jekyll-brotli gem (https://github.com/philnash/jekyll-brotli/) # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-brotli", "~> 2.2.1" - gem "jekyll-sitemap", "~> 1.4.0" + gem "jekyll-brotli", "~> 2.2" + gem "jekyll-sitemap", "~> 1.4" end # Jekyll 3.9.0 now requires this explicitly installed, apparently -gem "kramdown-parser-gfm", "~> 1.1.0" +gem "kramdown-parser-gfm", "~> 1.1" +gem "webrick", "~> 1.7" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.0" if Gem.win_platform? +gem "wdm", "~> 0.1" if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index db59cba1..2710b317 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,16 +60,18 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.9.0) - jekyll-brotli (~> 2.2.1) - jekyll-sitemap (~> 1.4.0) - kramdown-parser-gfm (~> 1.1.0) + jekyll (~> 3.9) + jekyll-brotli (~> 2.2) + jekyll-sitemap (~> 1.4) + kramdown-parser-gfm (~> 1.1) tzinfo-data + webrick (~> 1.7) BUNDLED WITH 2.2.5 From 41c438589de18dcee5093b5313416e6cafae059f Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 14:50:54 -0600 Subject: [PATCH 8/9] Upgrade to jekyll 4.2.0 --- .gitignore | 1 + Gemfile | 2 +- Gemfile.lock | 34 ++++++++++++++++++---------------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index bb836e13..ab6f392c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ font/.fontcustom-manifest.json assets/webfonts/ptio-font-preview.html vendor .bundle +.jekyll-cache diff --git a/Gemfile b/Gemfile index ad86f80f..d7dc44c6 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.9" +gem "jekyll", "~> 4.2" # Install jekyll-brotli gem (https://github.com/philnash/jekyll-brotli/) # If you have any plugins, put them here! diff --git a/Gemfile.lock b/Gemfile.lock index 2710b317..6170c7d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,26 +13,28 @@ GEM ffi (1.14.2) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (4.2.0) 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.17, < 3) + kramdown (~> 2.3) + 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 (~> 2.0) jekyll-brotli (2.2.1) brotli (~> 0.2.0) jekyll (>= 3.0, < 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) @@ -45,7 +47,7 @@ GEM listen (3.4.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.6) @@ -55,18 +57,18 @@ GEM rexml (3.2.4) rouge (3.26.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 (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) webrick (1.7.0) PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.9) + jekyll (~> 4.2) jekyll-brotli (~> 2.2) jekyll-sitemap (~> 1.4) kramdown-parser-gfm (~> 1.1) From 45c0d4acc1fb10838a60c8b7d017f321d24b4256 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 15:18:45 -0600 Subject: [PATCH 9/9] Create .buildrc --- .buildrc | 2 ++ build.sh | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100755 .buildrc delete mode 100755 build.sh diff --git a/.buildrc b/.buildrc new file mode 100755 index 00000000..59ac80c8 --- /dev/null +++ b/.buildrc @@ -0,0 +1,2 @@ +bundle install +JEKYLL_ENV=production bundle exec jekyll build diff --git a/build.sh b/build.sh deleted file mode 100755 index ae4acd74..00000000 --- a/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh -set -e # halt script on error - -JEKYLL_ENV=production bundle exec jekyll build