You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2018/02/14 05:46:12 UTC

[2/4] calcite git commit: Site: Move from ruby-2.1 to ruby-2.4; upgrade github-pages, replace jekyll-oembed with jekyll_oembed

Site: Move from ruby-2.1 to ruby-2.4; upgrade github-pages, replace jekyll-oembed with jekyll_oembed


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/962c0a58
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/962c0a58
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/962c0a58

Branch: refs/heads/master
Commit: 962c0a585f29fdb8717fc84395d218ffa15d8cba
Parents: bb57919
Author: Julian Hyde <jh...@apache.org>
Authored: Fri Feb 9 15:04:06 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Feb 13 21:44:50 2018 -0800

----------------------------------------------------------------------
 site/Gemfile     | 4 ++--
 site/README.md   | 2 +-
 site/_config.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/962c0a58/site/Gemfile
----------------------------------------------------------------------
diff --git a/site/Gemfile b/site/Gemfile
index d608db6..cbd9d22 100644
--- a/site/Gemfile
+++ b/site/Gemfile
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 source 'https://rubygems.org'
-gem 'github-pages', '67'
+gem 'github-pages', '150'
 gem 'rouge'
-gem 'jekyll-oembed', :require => 'jekyll_oembed'
+gem 'jekyll_oembed'
 gem 'jekyll-redirect-from'
 # End Gemfile

http://git-wip-us.apache.org/repos/asf/calcite/blob/962c0a58/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index 2cd5503..3f97cc7 100644
--- a/site/README.md
+++ b/site/README.md
@@ -24,7 +24,7 @@ This directory contains the code for the Apache Calcite web site,
 
 ## Setup
 
-Note that the site can currently only be built with Ruby 2.1.x.
+Site generation currently works best with ruby-2.4.1.
 
 1. `cd site`
 2. `svn co https://svn.apache.org/repos/asf/calcite/site target`

http://git-wip-us.apache.org/repos/asf/calcite/blob/962c0a58/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index 799d4cc..08427ff 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -50,7 +50,7 @@ baseurl:
 # The base path where the Avatica's website is deployed
 avaticaBaseurl: /avatica
 
-gems:
+plugins:
     - jekyll-redirect-from
 
 # End _config.yml