Update to Jekyll 3.3.0
Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/328aa26d Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/328aa26d Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/328aa26d Branch: refs/heads/master Commit: 328aa26d6a9ce288b2b6dc8a227e0c12cbfb8826 Parents: 358b7b4 Author: Christopher Tubbs <[email protected]> Authored: Thu Nov 10 17:14:58 2016 -0500 Committer: Christopher Tubbs <[email protected]> Committed: Thu Nov 10 17:26:40 2016 -0500 ---------------------------------------------------------------------- Gemfile | 2 +- Gemfile.lock | 46 ++++++++++++++++++++--------------- _config-asf.yml | 47 ------------------------------------ _config.yml | 1 - _devtools/cibuild | 2 +- _devtools/git-hooks/post-commit | 9 ++----- source.md | 10 ++++---- 7 files changed, 35 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/Gemfile ---------------------------------------------------------------------- diff --git a/Gemfile b/Gemfile index 2cc05cb..3d5739a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'github-pages', '99', group: :jekyll_plugins +gem 'github-pages', '104', group: :jekyll_plugins gem 'therubyracer' http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/Gemfile.lock ---------------------------------------------------------------------- diff --git a/Gemfile.lock b/Gemfile.lock index 1a4bbfe..799212e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,27 +21,28 @@ GEM ffi (1.9.14) forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (99) + github-pages (104) activesupport (= 4.2.7) github-pages-health-check (= 1.2.0) - jekyll (= 3.2.1) + jekyll (= 3.3.0) + jekyll-avatar (= 0.4.2) jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.7.2) + jekyll-feed (= 0.8.0) jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.1.1) + 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-seo-tag (= 2.0.0) - jekyll-sitemap (= 0.10.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) - minima (= 1.2.0) + minima (= 2.0.0) rouge (= 1.11.1) terminal-table (~> 1.4) github-pages-health-check (1.2.0) @@ -54,7 +55,8 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.2.1) + jekyll (3.3.0) + addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -64,14 +66,17 @@ GEM pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) + jekyll-avatar (0.4.2) + jekyll (~> 3.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-feed (0.7.2) + jekyll-feed (0.8.0) + jekyll (~> 3.3) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (2.1.1) + jekyll-github-metadata (2.2.0) jekyll (~> 3.1) - octokit (~> 4.0) + octokit (~> 4.0, != 4.4.0) jekyll-mentions (1.2.0) activesupport (~> 4.0) html-pipeline (~> 2.3) @@ -81,9 +86,10 @@ GEM jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-seo-tag (2.0.0) - jekyll (~> 3.1) - jekyll-sitemap (0.10.0) + 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) @@ -101,14 +107,14 @@ GEM rb-inotify (>= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) - minima (1.2.0) + minima (2.0.0) minitest (5.9.1) multipart-post (2.0.0) net-dns (0.8.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - octokit (4.4.1) - sawyer (~> 0.7.0, >= 0.5.3) + octokit (4.6.0) + sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.14.0) forwardable-extended (~> 2.6) public_suffix (1.5.3) @@ -119,8 +125,8 @@ GEM rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.22) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) + sawyer (0.8.0) + addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 0.10) terminal-table (1.7.3) unicode-display_width (~> 1.1.1) @@ -138,7 +144,7 @@ PLATFORMS ruby DEPENDENCIES - github-pages (= 99) + github-pages (= 104) therubyracer BUNDLED WITH http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/_config-asf.yml ---------------------------------------------------------------------- diff --git a/_config-asf.yml b/_config-asf.yml deleted file mode 100644 index bc6840c..0000000 --- a/_config-asf.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Welcome to Jekyll! -# -# This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely need to edit after that. -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'jekyll serve'. If you change this file, please restart the server process. - -# Site settings -title: Apache Accumulo⢠-email: [email protected] -description: > # this means to ignore newlines until "baseurl:" - The Apache Accumulo⢠sorted, distributed key/value store is a robust, scalable, - high performance data storage and retrieval system. -baseurl: "" # the subpath of your site, e.g. /blog -url: "https://accumulo.apache.org"; # the base hostname & protocol for your site -twitter_username: ApacheAccumulo -exclude: [vendor] -latest_minor_release: 1.8 -num_home_posts: 5 - -# Build settings -markdown: kramdown - -defaults: - - - scope: - path: "" - type: "pages" - values: - layout: "default" - - - scope: - path: "_posts/blog" - type: "posts" - values: - layout: "post" - category: "blog" - - - scope: - path: "_posts/release" - type: "posts" - values: - layout: "release" - category: "release" - permalink: "/:categories/:title/" -whitelist: [jekyll-redirect-from] -gems: [jekyll-redirect-from] http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/_config.yml ---------------------------------------------------------------------- diff --git a/_config.yml b/_config.yml index 77bb62e..51c5122 100644 --- a/_config.yml +++ b/_config.yml @@ -11,7 +11,6 @@ email: [email protected] description: > # this means to ignore newlines until "baseurl:" The Apache Accumulo⢠sorted, distributed key/value store is a robust, scalable, high performance data storage and retrieval system. -baseurl: "/accumulo" # the subpath of your site, e.g. /blog url: "https://accumulo.apache.org"; # the base hostname & protocol for your site twitter_username: ApacheAccumulo exclude: [vendor] http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/_devtools/cibuild ---------------------------------------------------------------------- diff --git a/_devtools/cibuild b/_devtools/cibuild index c1b7016..be105d2 100755 --- a/_devtools/cibuild +++ b/_devtools/cibuild @@ -1,5 +1,5 @@ #! /usr/bin/env bash set -e # halt script on error -bundle exec jekyll build --config _config-asf.yml --safe +bundle exec jekyll build --safe http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/_devtools/git-hooks/post-commit ---------------------------------------------------------------------- diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit index 46b8eeb..5427efe 100755 --- a/_devtools/git-hooks/post-commit +++ b/_devtools/git-hooks/post-commit @@ -5,8 +5,6 @@ build_jekyll_site() { local source_br; source_br=$1 # $2 is the name of the target branch local tgt_br; tgt_br=$2 - # $3 jekyll config file to build - local config; config=$3 local cur_branch; cur_branch=$(git rev-parse --symbolic-full-name HEAD) || return 1 @@ -33,9 +31,6 @@ build_jekyll_site() { # don't build what's not checked in require_clean_work_tree - # check that jekyll config file exists - [[ -f $config ]] || die "fatal: $config is not a file or does not exist" - # check gem versions bundle check >/dev/null || die "fatal: gems are out of date; run 'bundle install'" @@ -44,7 +39,7 @@ build_jekyll_site() { trap "rm -rf '""$workdir""'" 0 1 2 3 15 # actually generate the site - bundle exec jekyll build --config "$config" --destination "$workdir/_site" --safe || die "fatal: jekyll build failure" + bundle exec jekyll build --destination "$workdir/_site" --safe || die "fatal: jekyll build failure" # prepare and commit to the target branch export GIT_INDEX_FILE="$workdir/index" @@ -57,4 +52,4 @@ build_jekyll_site() { return 0 } -build_jekyll_site 'gh-pages' 'asf-site' '_config-asf.yml' +build_jekyll_site 'gh-pages' 'asf-site' http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/328aa26d/source.md ---------------------------------------------------------------------- diff --git a/source.md b/source.md index 41a3d51..e40c597 100644 --- a/source.md +++ b/source.md @@ -33,7 +33,7 @@ directly by a committer, with a pull request to [GitHub][github], or a patch submitted to [JIRA][jiraloc]. The rendered site can be previewed locally or on [GitHub][site-mirror], and the rendered site (in the `_site` directory) will be merged into the `asf-site` branch to update our [official/canonical -site][site-canon] after being built with the `_config-asf.yml` configuration. +site][site-canon] after being built. To manage any Gem dependencies, it is highly recommended to use [Bundler](https://bundler.io). To start using Bundler, install it and then the dependencies for the website: @@ -47,19 +47,19 @@ To get help with jekyll: To test the site locally (usually on http://localhost:4000): - jekyll serve --config _config-asf.yml --safe + jekyll serve --safe To do the same with Bundler: - bundle exec jekyll serve --config _config-asf.yml --safe + bundle exec jekyll serve --safe To build for updating the `asf-site` branch: - jekyll build --config _config-asf.yml --safe + jekyll build --safe To do the same with Bundler: - bundle exec jekyll build --config _config-asf.yml --safe + bundle exec jekyll build --safe For preview convenience and consistent builds and testing, build using a version which looks the same locally and on GitHub.
