accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo-website] branch asf-site updated: Jekyll build from master:d8c0592
Date Fri, 30 Mar 2018 19:43:22 GMT
This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new d9a3259  Jekyll build from master:d8c0592
d9a3259 is described below

commit d9a32590d806182aa71dd9d4ef182c08ff9f2c1d
Author: Keith Turner <kturner@apache.org>
AuthorDate: Fri Mar 30 15:42:48 2018 -0400

    Jekyll build from master:d8c0592
    
    Improve committer instructions in readme (#73)
---
 README.md                    | 32 +++++++++++++++++++++++++++-----
 feed.xml                     |  4 ++--
 how-to-contribute/index.html |  2 +-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 56f0bab..8db6b0e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ use [Bundler] to install the necessary dependencies to run and build the website
 ## Install Bundler and dependencies
 
 Ruby is required to use Bundler so first make sure you have Ruby on your machine.  If you
are using
-an OS packaged version of Ruby, you will have to also install the ruby-dev (Ubuntu) or 
+an OS packaged version of Ruby, you will have to also install the ruby-dev (Ubuntu) or
 ruby-devel (Fedora) package as well.
 
 With Ruby installed on your machine, you can install [Bundler] using the command below:
@@ -38,12 +38,34 @@ You can just build static HTML files which are viewable in `_config.yml`:
 ## Update the production website
 
 For Apache Accumulo committers, the `asf-site` branch needs to be updated with the generated
-HTML.
+HTML.  Changes to this branch are automagically mirrored to the website.
 
 This can be done easily by invoking the post-commit hook (either by hand, or automatically
via configuring
-Git to invoke the post-commit hook).
-
-`./_devtools/git-hooks/post-commit`
+Git to invoke the post-commit hook).  The commands below are a guide for committers who wish
to publish
+the web site.
+
+```bash
+# ensure local asf-site branch is up to date
+git checkout asf-site
+git pull upstream asf-site
+
+# switch to master branch, update it, and build new site
+git checkout master
+git pull upstream master
+./_devtools/git-hooks/post-commit
+
+# switch to asf-site, look at the commit created by post-commit script, and push it if ok
+git checkout asf-site
+git log -p
+git push upstream asf-site
+```
+In the commands above `upstream` is :
+
+```bash
+$ git remote -v | grep upstream
+upstream	https://gitbox.apache.org/repos/asf/accumulo-website/ (fetch)
+upstream	https://gitbox.apache.org/repos/asf/accumulo-website/ (push)
+```
 
 To automatically run this post-commit hook in your local repository, copy
 the given file into your `.git/hook` directory:
diff --git a/feed.xml b/feed.xml
index 4d6a77c..4f72e34 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Fri, 30 Mar 2018 12:02:40 -0400</pubDate>
-    <lastBuildDate>Fri, 30 Mar 2018 12:02:40 -0400</lastBuildDate>
+    <pubDate>Fri, 30 Mar 2018 15:42:37 -0400</pubDate>
+    <lastBuildDate>Fri, 30 Mar 2018 15:42:37 -0400</lastBuildDate>
     <generator>Jekyll v3.6.2</generator>
     
     
diff --git a/how-to-contribute/index.html b/how-to-contribute/index.html
index 7ca0af2..d53038e 100644
--- a/how-to-contribute/index.html
+++ b/how-to-contribute/index.html
@@ -180,7 +180,7 @@ issue, please do the following :</p>
   <li>Open a new GitHub issue or pull request.</li>
   <li>Link the GitHub issue to the JIRA issue.</li>
   <li>Link the JIRA issue to the GitHub issue.</li>
-  <li>Close the JIRA issue.</li>
+  <li>Close the JIRA issue as a duplicate.</li>
 </ul>
 
 <p>Eventually JIRA will be transitioned to a read-only state for reference.  For

-- 
To stop receiving notification emails like this one, please contact
kturner@apache.org.

Mime
View raw message