You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by wc...@apache.org on 2016/03/17 04:34:38 UTC
[2/3] incubator-quarks-website git commit: [QUARKS-28] make sure we
git add in build.sh and add Developing section to README.md
[QUARKS-28] make sure we git add in build.sh and add Developing section to README.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/commit/fe3df5d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/fe3df5d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/fe3df5d8
Branch: refs/heads/master
Commit: fe3df5d80053c73e56b3af4977d95cb5591567f8
Parents: 8d74678
Author: Katherine Marsden <km...@apache.org>
Authored: Tue Mar 15 16:10:29 2016 -0700
Committer: Katherine Marsden <km...@apache.org>
Committed: Tue Mar 15 16:10:29 2016 -0700
----------------------------------------------------------------------
README.md | 16 ++++++++++------
build.sh | 3 ++-
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/fe3df5d8/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 2f4549a..ae85a11 100644
--- a/README.md
+++ b/README.md
@@ -37,20 +37,24 @@ If you would like to make a change to the site:
1. Fork the [github mirror](https://github.com/apache/incubator-quarks-website)
2. Create a new branch from `master`
3. Add commit(s) to your branch
- 4. Test your changes locally
+ 4. Test your changes locally (see Developing)
5. Open a pull request on the github mirror
6. A committer will merge your changes if all is good
If you are a committer, do the following:
- 1. Update the master branch with your (or a Pull Request's) change.
- 2. Push updated master to the asf remote master (https://git-wip-us.apache.org/repos/asf/incubator-quarks-site.git)
- 3. Run `build.sh` from the master branch directory (requires jekyll). This will:
+ 1. Update the master branch with your (or a Pull Request's) change.
+ 2. Push updated master to the asf remote master (https://git-wip-us.apache.org/repos/asf/incubator-quarks-site.git)
+ 3. Run `build.sh` from the master branch directory (requires jekyll). This will:
- checks out and updates the `asf-site` branch with a new commit of the build from the current branch
4. At this point, you should be on the `asf-site` branch. Simply push this branch to the asf remote and the site will automatically be updated within seconds.
-
-
+Developing
+-----------
+ 1. Make your changes under site
+ 2. cd site
+ 3. jekyll serve -d ../content_tmp
+ 4. point your browser to http://localhost:4000/
http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/fe3df5d8/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index b65840d..5ef9992 100644
--- a/build.sh
+++ b/build.sh
@@ -1,11 +1,12 @@
set -e
cd site
-jekyll serve -d ../content_tmp
+jekyll build -d ../content_tmp
COMMIT_HASH=`git rev-parse HEAD`
cd ..
git checkout asf-site
rm -rf content
mv content_tmp content
+git add content
echo "Committing changes to asf-site branch from master branch"
git commit -m "from $COMMIT_HASH"
echo "You are now on the asf-site branch"