accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject accumulo git commit: Update to github-pages 72
Date Thu, 21 Apr 2016 21:16:55 GMT
Repository: accumulo
Updated Branches:
  refs/heads/gh-pages 4156e99a7 -> e91b62563


Update to github-pages 72


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

Branch: refs/heads/gh-pages
Commit: e91b62563daa949c13b99506c62bacc5308803c6
Parents: 4156e99
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Apr 21 17:02:32 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Apr 21 17:15:39 2016 -0400

----------------------------------------------------------------------
 Gemfile                         |  2 +-
 Gemfile.lock                    | 16 ++++++++--------
 _devtools/git-hooks/post-commit |  8 ++------
 3 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e91b6256/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index 5c5f557..1c1d249 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'github-pages', '67', group: :jekyll_plugins
+gem 'github-pages', '72', group: :jekyll_plugins

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e91b6256/Gemfile.lock
----------------------------------------------------------------------
diff --git a/Gemfile.lock b/Gemfile.lock
index 806cef2..6f7a1bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,19 +21,19 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     gemoji (2.1.0)
-    github-pages (67)
+    github-pages (72)
       RedCloth (= 4.2.9)
       github-pages-health-check (= 1.1.0)
       jekyll (= 3.0.3)
       jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.4.0)
+      jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 1.10.0)
+      jekyll-github-metadata (= 1.11.0)
       jekyll-mentions (= 1.1.2)
       jekyll-paginate (= 1.1.0)
       jekyll-redirect-from (= 0.10.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 1.3.2)
+      jekyll-seo-tag (= 1.3.3)
       jekyll-sitemap (= 0.10.0)
       jekyll-textile-converter (= 0.1.0)
       jemoji (= 0.6.2)
@@ -65,10 +65,10 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
-    jekyll-feed (0.4.0)
+    jekyll-feed (0.5.1)
     jekyll-gist (1.4.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (1.10.0)
+    jekyll-github-metadata (1.11.0)
       octokit (~> 4.0)
     jekyll-mentions (1.1.2)
       html-pipeline (~> 2.3)
@@ -78,7 +78,7 @@ GEM
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-seo-tag (1.3.2)
+    jekyll-seo-tag (1.3.3)
       jekyll (~> 3.0)
     jekyll-sitemap (0.10.0)
     jekyll-textile-converter (0.1.0)
@@ -127,7 +127,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages (= 67)
+  github-pages (= 72)
 
 BUNDLED WITH
    1.11.2

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e91b6256/_devtools/git-hooks/post-commit
----------------------------------------------------------------------
diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit
index 40a8201..46b8eeb 100755
--- a/_devtools/git-hooks/post-commit
+++ b/_devtools/git-hooks/post-commit
@@ -36,12 +36,8 @@ build_jekyll_site() {
   # check that jekyll config file exists
   [[ -f $config ]] || die "fatal: $config is not a file or does not exist"
 
-  # build using jekyll 3
-  local regex
-  regex='^jekyll 3[.](0[.][3-9][0-9]*|0[.][1-2][0-9]+|[1-9][0-9]*[.][0-9]+)'
-  local jekyll
-  jekyll=$(jekyll -v 2>/dev/null)
-  [[ $jekyll =~ $regex ]] || die "fatal: requires jekyll >= 3.0.3 to build"
+  # check gem versions
+  bundle check >/dev/null || die "fatal: gems are out of date; run 'bundle install'"
 
   # prep the working location
   local workdir; workdir=$(mktemp -d /tmp/jekyll-XXXXXXXXXX) || die "fatal: unable to allocate
a temporary directory"


Mime
View raw message