From e098a53185cf4d7ed9a6575510834028ae2d9b00 Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Fri, 6 Mar 2020 20:43:17 +1000 Subject: [PATCH] revert to stable jekyll, don't bother with html validation --- .drone.yml | 1 - .gitignore | 1 + Gemfile | 5 +---- Gemfile.lock | 61 +++++++++++++++------------------------------------- 4 files changed, 19 insertions(+), 49 deletions(-) diff --git a/.drone.yml b/.drone.yml index b86b483..1a3556f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,4 +5,3 @@ pipeline: - gem install bundler - bundle install --jobs=4 - bundle exec jekyll build - - bundle exec htmlproofer ./_site --disable-external diff --git a/.gitignore b/.gitignore index 274b281..3c0d93a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ _subrecipes .jekyll-cache .jekyll-metadata vendor +.bundle/ \ No newline at end of file diff --git a/Gemfile b/Gemfile index f3ce85f..1eea778 100644 --- a/Gemfile +++ b/Gemfile @@ -7,10 +7,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -# gem "jekyll", "~> 4.0.0" -gem "nokogiri", ">= 1.11.0.rc1" -gem "jekyll", github: "jekyll/jekyll" -gem "html-proofer" +gem "jekyll", "~> 4.0.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. # gem "minima", "~> 2.5" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and diff --git a/Gemfile.lock b/Gemfile.lock index 5332a0f..49ac9a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,3 @@ -GIT - remote: https://github.com/jekyll/jekyll.git - revision: ab6ef0b257e4c7aafec0518d93bea3e9c4b75b75 - specs: - jekyll (4.0.0) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (>= 0.9.5, < 2) - jekyll-sass-converter (~> 2.0) - jekyll-watch (~> 2.0) - kramdown (~> 2.1) - kramdown-parser-gfm (~> 1.0) - liquid (~> 4.0) - mercenary (~> 0.4.0) - pathutil (~> 0.9) - rouge (~> 3.0) - safe_yaml (~> 1.0) - terminal-table (~> 1.8) - GEM remote: https://rubygems.org/ specs: @@ -28,22 +8,27 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) eventmachine (1.2.7) ffi (1.12.2) forwardable-extended (2.6.0) - html-proofer (3.15.1) - addressable (~> 2.3) - mercenary (~> 0.3) - nokogumbo (~> 2.0) - parallel (~> 1.3) - rainbow (~> 3.0) - typhoeus (~> 1.3) - yell (~> 2.0) http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) + jekyll (4.0.0) + addressable (~> 2.4) + colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (>= 0.9.5, < 2) + jekyll-sass-converter (~> 2.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (~> 0.3.3) + pathutil (~> 0.9) + rouge (~> 3.0) + safe_yaml (~> 1.0) + terminal-table (~> 1.8) jekyll-sass-converter (2.1.0) sassc (> 2.0.1, < 3.0) jekyll-watch (2.2.1) @@ -55,17 +40,10 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.4.0) - mini_portile2 (2.4.0) - nokogiri (1.11.0.rc1) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.1) + mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.3) - rainbow (3.0.0) rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) @@ -76,23 +54,18 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - typhoeus (1.3.1) - ethon (>= 0.9.0) tzinfo (1.2.6) thread_safe (~> 0.1) tzinfo-data (1.2019.3) tzinfo (>= 1.0.0) unicode-display_width (1.6.1) wdm (0.1.1) - yell (2.2.2) PLATFORMS ruby DEPENDENCIES - html-proofer - jekyll! - nokogiri (>= 1.11.0.rc1) + jekyll (~> 4.0.0) tzinfo (~> 1.2) tzinfo-data wdm (~> 0.1.1)