fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kennethmcfarl...@apache.org
Subject [fluo-website] branch asf-site updated: Jekyll build from gh-pages:acae13e
Date Fri, 22 Dec 2017 21:44:53 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/asf-site by this push:
     new 42156be  Jekyll build from gh-pages:acae13e
42156be is described below

commit 42156bee1ac9693bebf586dec5179b2e2b82a438
Author: Kenneth McFarland <kennethpaulmcfarland@gmail.com>
AuthorDate: Fri Dec 22 13:43:16 2017 -0800

    Jekyll build from gh-pages:acae13e
    
    Add committer instructions to readme (#116)
---
 README.md         | 30 ++++++++++++++++++++++++++++++
 feed.xml          |  4 ++--
 people/index.html |  5 -----
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7d7a82f..6f4de1b 100644
--- a/README.md
+++ b/README.md
@@ -44,3 +44,33 @@ replace any reference to `fluo` with `recipes`.
 
 3. Update `_config.yml` by adding a `fluo-1-3` collection and setting default values for
it.
    You may want to keep 1.2 values for github & javadocs until 1.3 is released.
+   
+## Committer instructions
+
+To publish Fluo's website the `gh-pages` branch must be rendered into the `asf-site` 
+branch.  The script `_scripts/git-hooks/post-commit` automates rendering into the `asf-site`
branch.
+The commands below serve as 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 gh-pages branch, update it, and build new site 
+ git checkout gh-pages
+ git pull upstream gh-pages 
+ ./_scripts/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 
+
+```
+$ git remote -v | grep upstream
+upstream	https://gitbox.apache.org/repos/asf/fluo-website/ (fetch)
+upstream	https://gitbox.apache.org/repos/asf/fluo-website/ (push)``
+```
diff --git a/feed.xml b/feed.xml
index 653c925..44897a9 100644
--- a/feed.xml
+++ b/feed.xml
@@ -5,8 +5,8 @@
     <description></description>
     <link>https://fluo.apache.org//</link>
     <atom:link href="https://fluo.apache.org//feed.xml" rel="self" type="application/rss+xml"
/>
-    <pubDate>Fri, 22 Dec 2017 18:43:31 +0000</pubDate>
-    <lastBuildDate>Fri, 22 Dec 2017 18:43:31 +0000</lastBuildDate>
+    <pubDate>Fri, 22 Dec 2017 21:43:09 +0000</pubDate>
+    <lastBuildDate>Fri, 22 Dec 2017 21:43:09 +0000</lastBuildDate>
     <generator>Jekyll v3.3.1</generator>
     
     
diff --git a/people/index.html b/people/index.html
index 74205c5..1c6ec63 100644
--- a/people/index.html
+++ b/people/index.html
@@ -225,11 +225,6 @@ based on commits.</p>
       <td><a href="https://www.timeanddate.com/time/zones/et">ET</a></td>
     </tr>
     <tr>
-      <td><a href="https://github.com/kamaci">Furkan KAMACI</a></td>
-      <td><a href="https://www.lagom.ai/">LAGOM</a></td>
-      <td><a href="https://www.timeanddate.com/time/zones/trt">TRT</a></td>
-    </tr>
-    <tr>
       <td><a href="https://github.com/Garvit244">Garvit Bansal</a></td>
       <td><a href="https://www.flipkart.com">Flipkart</a></td>
       <td><a href="https://www.timeanddate.com/time/zones/ist">IST</a></td>

-- 
To stop receiving notification emails like this one, please contact
['"commits@fluo.apache.org" <commits@fluo.apache.org>'].

Mime
View raw message