From e4bebfd2506356b6e1db1c35f9f624d7326d0266 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Thu, 17 Nov 2016 13:20:54 +0000 Subject: [PATCH] Workaround bug in bundler where the wrong version of `github-pages` is fetched. This has been reported at https://github.com/github/pages-gem/issues/351 https://github.com/bundler/bundler/issues/5154 This unfortunately means that 999a49a96cf9231f029b24c9fabde8810a0348f9 was wrong because the wrong gem versions were fetched which broke the build. So the `Gemfile.lock` had to be regenerated. --- Gemfile | 8 ++- Gemfile.lock | 134 ++++++++++++++++++++++++++------------------------- 2 files changed, 76 insertions(+), 66 deletions(-) diff --git a/Gemfile b/Gemfile index 37f5eaa4..f452fc5e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,8 @@ source 'https://rubygems.org' -gem 'github-pages', group: :jekyll_plugins +# FIXME: '>=104' is a workaround for a bug in +# bundler where the wrong version of `github-pages` +# is fetched. +# See +# https://github.com/github/pages-gem/issues/351 +# https://github.com/bundler/bundler/issues/5154 +gem 'github-pages', '>=104', group: :jekyll_plugins diff --git a/Gemfile.lock b/Gemfile.lock index 234f2a20..eac5e3e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,100 +1,112 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.9) - activesupport (5.0.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (4.2.7) i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - blankslate (2.1.2.4) - classifier-reborn (2.0.4) - fast-stemmer (~> 1.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) - colorator (0.1) - concurrent-ruby (1.0.2) + colorator (1.1.0) ethon (0.9.1) ffi (>= 1.3.0) execjs (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - fast-stemmer (1.0.2) ffi (1.9.14) + forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (39) - RedCloth (= 4.2.9) - github-pages-health-check (~> 0.2) - jekyll (= 2.4.0) + github-pages (104) + activesupport (= 4.2.7) + github-pages-health-check (= 1.2.0) + jekyll (= 3.3.0) + jekyll-avatar (= 0.4.2) jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.3.1) - jekyll-mentions (= 0.2.1) - jekyll-redirect-from (= 0.8.0) + jekyll-feed (= 0.8.0) + jekyll-gist (= 1.4.0) + jekyll-github-metadata (= 2.2.0) + jekyll-mentions (= 1.2.0) + jekyll-paginate (= 1.1.0) + jekyll-redirect-from (= 0.11.0) jekyll-sass-converter (= 1.3.0) - jekyll-sitemap (= 0.8.1) - jemoji (= 0.5.0) - kramdown (= 1.5.0) - liquid (= 2.6.2) - maruku (= 0.7.0) + jekyll-seo-tag (= 2.1.0) + jekyll-sitemap (= 0.12.0) + jekyll-swiss (= 0.4.0) + jemoji (= 0.7.0) + kramdown (= 1.11.1) + liquid (= 3.0.6) + listen (= 3.0.6) mercenary (~> 0.3) - pygments.rb (= 0.6.3) - rdiscount (= 2.1.7) - redcarpet (= 3.3.2) + minima (= 2.0.0) + rouge (= 1.11.1) terminal-table (~> 1.4) - github-pages-health-check (0.3.2) - net-dns (~> 0.6) + github-pages-health-check (1.2.0) + addressable (~> 2.3) + net-dns (~> 0.8) + octokit (~> 4.0) public_suffix (~> 1.4) typhoeus (~> 0.7) - html-pipeline (1.9.0) + html-pipeline (2.4.2) activesupport (>= 2) - nokogiri (~> 1.4) + nokogiri (>= 1.4) i18n (0.7.0) - jekyll (2.4.0) - classifier-reborn (~> 2.0) - colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) + jekyll (3.3.0) + addressable (~> 2.4) + colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + pathutil (~> 0.9) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) + jekyll-avatar (0.4.2) + jekyll (~> 3.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-feed (0.3.1) + jekyll-feed (0.8.0) + jekyll (~> 3.3) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-mentions (0.2.1) - html-pipeline (~> 1.9.0) - jekyll (~> 2.0) + jekyll-github-metadata (2.2.0) + jekyll (~> 3.1) + octokit (~> 4.0, != 4.4.0) + jekyll-mentions (1.2.0) + activesupport (~> 4.0) + html-pipeline (~> 2.3) + jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.8.0) + jekyll-redirect-from (0.11.0) jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-sitemap (0.8.1) + jekyll-seo-tag (2.1.0) + jekyll (~> 3.3) + jekyll-sitemap (0.12.0) + jekyll (~> 3.3) + jekyll-swiss (0.4.0) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) - jemoji (0.5.0) + jemoji (0.7.0) + activesupport (~> 4.0) gemoji (~> 2.0) - html-pipeline (~> 1.9) - jekyll (>= 2.0) - kramdown (1.5.0) - liquid (2.6.2) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - maruku (0.7.0) + html-pipeline (~> 2.2) + jekyll (>= 3.0) + json (1.8.3) + kramdown (1.11.1) + liquid (3.0.6) + listen (3.0.6) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) + minima (2.0.0) minitest (5.9.1) multipart-post (2.0.0) net-dns (0.8.0) @@ -102,18 +114,13 @@ GEM mini_portile2 (~> 2.1.0) octokit (4.6.0) sawyer (~> 0.8.0, >= 0.5.3) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.12) + pathutil (0.14.0) + forwardable-extended (~> 2.6) public_suffix (1.5.3) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) - rdiscount (2.1.7) - redcarpet (3.3.2) + rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.22) sawyer (0.8.0) @@ -122,20 +129,17 @@ GEM terminal-table (1.7.3) unicode-display_width (~> 1.1.1) thread_safe (0.3.5) - toml (0.1.2) - parslet (~> 1.5.0) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) unicode-display_width (1.1.1) - yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - github-pages + github-pages (>= 104) BUNDLED WITH 1.13.6