You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/04/14 23:27:56 UTC
[1/2] accumulo git commit: Convert to using bundler with fixed gem
versions
Repository: accumulo
Updated Branches:
refs/heads/asf-site a53d6ec01 -> 3c54a0cb5
refs/heads/gh-pages b23462058 -> f43eba4fc
Convert to using bundler with fixed gem versions
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f43eba4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f43eba4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f43eba4f
Branch: refs/heads/gh-pages
Commit: f43eba4fc0591f08b4395f74620df87d45a9ea17
Parents: b234620
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Apr 14 17:26:19 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Apr 14 17:26:19 2016 -0400
----------------------------------------------------------------------
.gitignore | 7 ++++---
Gemfile | 2 ++
_config-asf.yml | 1 +
_config.yml | 1 +
_devtools/git-hooks/post-commit | 3 ++-
5 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43eba4f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 45c1505..8642112 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-_site
-.sass-cache
-.jekyll-metadata
+/_site
+/.sass-cache
+/.jekyll-metadata
+/Gemfile.lock
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43eba4f/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..5c5f557
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'github-pages', '67', group: :jekyll_plugins
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43eba4f/_config-asf.yml
----------------------------------------------------------------------
diff --git a/_config-asf.yml b/_config-asf.yml
index 9cfd697..3b0dc6a 100644
--- a/_config-asf.yml
+++ b/_config-asf.yml
@@ -15,6 +15,7 @@ baseurl: "" # the subpath of your site, e.g. /blog
url: "https://accumulo.apache.org" # the base hostname & protocol for your site
twitter_username: ApacheAccumulo
github_username: apache/accumulo
+repository: apache/accumulo
# Build settings
markdown: kramdown
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43eba4f/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index e7756b3..f07739c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,6 +15,7 @@ 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
github_username: apache/accumulo
+repository: apache/accumulo
# Build settings
markdown: kramdown
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f43eba4f/_devtools/git-hooks/post-commit
----------------------------------------------------------------------
diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit
index bbc6417..40a8201 100755
--- a/_devtools/git-hooks/post-commit
+++ b/_devtools/git-hooks/post-commit
@@ -48,10 +48,11 @@ build_jekyll_site() {
trap "rm -rf '""$workdir""'" 0 1 2 3 15
# actually generate the site
- jekyll build --config "$config" --destination "$workdir/_site" --safe || die "fatal: jekyll build failure"
+ bundle exec jekyll build --config "$config" --destination "$workdir/_site" --safe || die "fatal: jekyll build failure"
# prepare and commit to the target branch
export GIT_INDEX_FILE="$workdir/index"
+ rm -f "$workdir/_site/Gemfile" "$workdir/_site/Gemfile.lock"
git --work-tree="$workdir/_site" add . || die "fatal: error adding $workdir/_site"
local tree; tree=$(git write-tree) || die "fatal: error writing tree"
local commit; commit=$(git commit-tree "$tree" -p "$target_branch" -m "$message") || die "fatal: error writing commit"
[2/2] accumulo git commit: Jekyll build from gh-pages:f43eba4
Posted by ct...@apache.org.
Jekyll build from gh-pages:f43eba4
Convert to using bundler with fixed gem versions
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c54a0cb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c54a0cb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c54a0cb
Branch: refs/heads/asf-site
Commit: 3c54a0cb59143b8374c961dd37949d288905662f
Parents: a53d6ec
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Apr 14 17:26:19 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Apr 14 17:26:27 2016 -0400
----------------------------------------------------------------------
feed.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c54a0cb/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 357d4f0..89edc9c 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,9 +6,9 @@
</description>
<link>https://accumulo.apache.org/</link>
<atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Mon, 11 Apr 2016 21:25:02 -0400</pubDate>
- <lastBuildDate>Mon, 11 Apr 2016 21:25:02 -0400</lastBuildDate>
- <generator>Jekyll v3.1.2</generator>
+ <pubDate>Thu, 14 Apr 2016 17:26:24 -0400</pubDate>
+ <lastBuildDate>Thu, 14 Apr 2016 17:26:24 -0400</lastBuildDate>
+ <generator>Jekyll v3.0.3</generator>
</channel>
</rss>