You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by av...@apache.org on 2017/03/19 03:59:20 UTC
[1/4] beam-site git commit: Improve committing website changes
section in the contribution guide
Repository: beam-site
Updated Branches:
refs/heads/asf-site f9b4c6e7a -> 41018ed60
Improve committing website changes section in the contribution guide
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/653218f8
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/653218f8
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/653218f8
Branch: refs/heads/asf-site
Commit: 653218f89c0a6b50283bf502538f8b131aa54ea1
Parents: f9b4c6e
Author: Isma�l Mej�a <ie...@apache.org>
Authored: Sun Mar 19 01:06:26 2017 +0100
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Sun Mar 19 01:08:50 2017 +0100
----------------------------------------------------------------------
src/contribute/contribution-guide.md | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam-site/blob/653218f8/src/contribute/contribution-guide.md
----------------------------------------------------------------------
diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md
index b2af352..c1617af 100644
--- a/src/contribute/contribution-guide.md
+++ b/src/contribute/contribution-guide.md
@@ -442,7 +442,7 @@ The general guidelines for cloning a repository can be adjusted to use the `asf-
While you are working on your pull request, you can test and develop live by running the following command in the root folder of the website:
- $ bundle exec jekyll serve
+ $ bundle exec jekyll serve --incremental
Jekyll will start a webserver on port 4000. As you make changes to the content, Jekyll will rebuild it automatically.
@@ -458,8 +458,15 @@ When you are ready, submit a pull request using the [Beam Site GitHub mirror](ht
During review, committers will patch in your PR, generate the static `content/`, and review the changes.
-#### Committing website changes
+#### Committing website changes (committers only)
Follow the same committer process as above, but using repository `apache/beam-site` and branch `asf-site`.
-In addition, the committer is responsible for doing the final `jekyll build` to generate the static content, so follow the instructions above to install `jekyll`.
+In addition, the committer is responsible for doing the final `bundle exec jekyll build` to generate the static content, so follow the instructions above to install `jekyll`.
+
+This command generates the `content/` directory. The committer should add and commit the content related to the PR.
+
+ $ git add content/<files related to the pr>
+ $ git commit -m "Regenerate website"
+
+Finally you should merge the changes into the `asf-site` branch and push them into the `apache` repository.
[2/4] beam-site git commit: Fix timezone to America/Los_Angeles
Posted by av...@apache.org.
Fix timezone to America/Los_Angeles
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/b470eb5b
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/b470eb5b
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/b470eb5b
Branch: refs/heads/asf-site
Commit: b470eb5b418949f19e862a5faeac06e0a4dc8bfb
Parents: 653218f
Author: Isma�l Mej�a <ie...@apache.org>
Authored: Sun Mar 19 01:09:00 2017 +0100
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Sun Mar 19 01:12:03 2017 +0100
----------------------------------------------------------------------
_config.yml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam-site/blob/b470eb5b/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 7d36162..2e9084c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -52,3 +52,6 @@ kramdown:
release_latest: 0.6.0
# Plugins are configured in the Gemfile.
+
+# Set the time zone for site generation, fixed to US Pacific Time
+timezone: America/Los_Angeles
[4/4] beam-site git commit: This closes #189
Posted by av...@apache.org.
This closes #189
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/41018ed6
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/41018ed6
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/41018ed6
Branch: refs/heads/asf-site
Commit: 41018ed6016c18fc0dac1a2740e510a9a2460bca
Parents: f9b4c6e c6d9226
Author: Zur, Aviem <az...@paypal.com>
Authored: Sun Mar 19 05:58:40 2017 +0200
Committer: Zur, Aviem <az...@paypal.com>
Committed: Sun Mar 19 05:58:40 2017 +0200
----------------------------------------------------------------------
_config.yml | 3 +++
content/contribute/contribution-guide/index.html | 17 +++++++++++++----
src/contribute/contribution-guide.md | 13 ++++++++++---
3 files changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/4] beam-site git commit: Regenerate website
Posted by av...@apache.org.
Regenerate website
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/c6d92268
Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/c6d92268
Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/c6d92268
Branch: refs/heads/asf-site
Commit: c6d922685e79463fa7f41a8f9dcd86aee59923c0
Parents: b470eb5
Author: Zur, Aviem <az...@paypal.com>
Authored: Sun Mar 19 05:55:02 2017 +0200
Committer: Zur, Aviem <az...@paypal.com>
Committed: Sun Mar 19 05:55:02 2017 +0200
----------------------------------------------------------------------
content/contribute/contribution-guide/index.html | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam-site/blob/c6d92268/content/contribute/contribution-guide/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/contribution-guide/index.html b/content/contribute/contribution-guide/index.html
index 4d4a782..af492a9 100644
--- a/content/contribute/contribution-guide/index.html
+++ b/content/contribute/contribution-guide/index.html
@@ -214,7 +214,7 @@
<li><a href="#website" id="markdown-toc-website">Website</a> <ul>
<li><a href="#one-time-setup-2" id="markdown-toc-one-time-setup-2">One-time Setup</a></li>
<li><a href="#working-on-your-change" id="markdown-toc-working-on-your-change">Working on your change</a></li>
- <li><a href="#committing-website-changes" id="markdown-toc-committing-website-changes">Committing website changes</a></li>
+ <li><a href="#committing-website-changes-committers-only" id="markdown-toc-committing-website-changes-committers-only">Committing website changes (committers only)</a></li>
</ul>
</li>
</ul>
@@ -736,7 +736,7 @@ $ git checkout -b <my-branch> origin/asf-site
<p>While you are working on your pull request, you can test and develop live by running the following command in the root folder of the website:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ bundle exec jekyll serve
+<div class="highlighter-rouge"><pre class="highlight"><code>$ bundle exec jekyll serve --incremental
</code></pre>
</div>
@@ -758,11 +758,20 @@ $ git checkout -b <my-branch> origin/asf-site
<p>During review, committers will patch in your PR, generate the static <code class="highlighter-rouge">content/</code>, and review the changes.</p>
-<h4 id="committing-website-changes">Committing website changes</h4>
+<h4 id="committing-website-changes-committers-only">Committing website changes (committers only)</h4>
<p>Follow the same committer process as above, but using repository <code class="highlighter-rouge">apache/beam-site</code> and branch <code class="highlighter-rouge">asf-site</code>.</p>
-<p>In addition, the committer is responsible for doing the final <code class="highlighter-rouge">jekyll build</code> to generate the static content, so follow the instructions above to install <code class="highlighter-rouge">jekyll</code>.</p>
+<p>In addition, the committer is responsible for doing the final <code class="highlighter-rouge">bundle exec jekyll build</code> to generate the static content, so follow the instructions above to install <code class="highlighter-rouge">jekyll</code>.</p>
+
+<p>This command generates the <code class="highlighter-rouge">content/</code> directory. The committer should add and commit the content related to the PR.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>$ git add content/<files related to the pr>
+$ git commit -m "Regenerate website"
+</code></pre>
+</div>
+
+<p>Finally you should merge the changes into the <code class="highlighter-rouge">asf-site</code> branch and push them into the <code class="highlighter-rouge">apache</code> repository.</p>
</div>