You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org> on 2016/02/29 23:47:52 UTC
Change in incubator-asterixdb-site[asf-site]: Update site edit instructions
Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/680
Change subject: Update site edit instructions
......................................................................
Update site edit instructions
Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
---
M site.md
1 file changed, 16 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site refs/changes/80/680/1
diff --git a/site.md b/site.md
index f4f7487..c3a3824 100644
--- a/site.md
+++ b/site.md
@@ -22,7 +22,7 @@
The website is managed using `git`. Clone the site as usual
- ➤ git clone https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
+ ➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
You will notice lots of Markdown files and HTML templates in the repository root. The compiled content of the website itself is served from the `content/` folder in this repository. That is to say, that the actual content of the website itself, as well as its sources are stored in the same repository. Additionally, the main branch on this repository is `asf-site` and not `master`
@@ -30,7 +30,19 @@
To add the Gerrit repository for this site, add it as a normal git remote:
+
➤ git remote add gerrit ssh://YOU@asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site
+
+
+Then, you likely will want to check out to make your own topic branch as to not work directly on the "live" branch, like so:
+
+
+ ➤ git checkout -b YOU/site
+
+And perform the git-gerrit init on this branch
+
+
+ ➤ git gerrit init -u ssh://imaxon@asterix-gerrit.ics.uci.edu:29418/ -p incubator-asterixdb-site
## Making a change to the site
@@ -55,22 +67,20 @@
Once you have made your commit, push it to Gerrit for review:
- ➤ git push gerrit HEAD:refs/for/asf-site
+ ➤ git gerrit submit -b asf-site
-
-If no Change-Id is provided, "ERROR: missing Change-Id in commit message footer" is returned when attempting to push to Gerrit. The error description also contains a) a proposal for a Change-Id that can be pasted to the commit message and b) instructions how to install a commit-msg hook into the local git repository that will automatically add a Change-Id.
### Submitting the change to the live site
When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site branch:
- ➤ git pull gerrit
+ ➤ git fetch gerrit
Then, push the exact commit from the Gerrit web interface to the ASF git repository. Do this with care! ASF git doesn't allow hard resets on branches, so whatever you push here is final.
- ➤ git push origin (SHA1 of submitted commit)
+ ➤ git push origin (SHA1 of submitted commit):asf-site
--
To view, visit https://asterix-gerrit.ics.uci.edu/680
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Ian Maxon <im...@apache.org>
Change in incubator-asterixdb-site[asf-site]: Update site edit instructions
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Update site edit instructions
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/680
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: Update site edit instructions
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has uploaded a new patch set (#2).
Change subject: Update site edit instructions
......................................................................
Update site edit instructions
Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
---
M site.md
1 file changed, 13 insertions(+), 8 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site refs/changes/80/680/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/680
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in incubator-asterixdb-site[asf-site]: Update site edit instructions
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Update site edit instructions
......................................................................
Patch Set 2:
Build Successful
https://asterix-jenkins.ics.uci.edu/job/asf-site/35/ : SUCCESS (skipped)
--
To view, visit https://asterix-gerrit.ics.uci.edu/680
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: Update site edit instructions
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has submitted this change and it was merged.
Change subject: Update site edit instructions
......................................................................
Update site edit instructions
Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/680
Reviewed-by: Till Westmann <ti...@apache.org>
---
M site.md
1 file changed, 13 insertions(+), 8 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
diff --git a/site.md b/site.md
index f4f7487..06e87fb 100644
--- a/site.md
+++ b/site.md
@@ -22,15 +22,22 @@
The website is managed using `git`. Clone the site as usual
- ➤ git clone https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
+ ➤ git clone -b asf-site https://git-wip-us.apache.org/repos/asf/incubator-asterixdb-site.git
You will notice lots of Markdown files and HTML templates in the repository root. The compiled content of the website itself is served from the `content/` folder in this repository. That is to say, that the actual content of the website itself, as well as its sources are stored in the same repository. Additionally, the main branch on this repository is `asf-site` and not `master`
Gerrit is used to submit code reviews for the website just as it is with the main codebase. The main difference the site is not strictly subject to code reviews.
-To add the Gerrit repository for this site, add it as a normal git remote:
- ➤ git remote add gerrit ssh://YOU@asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site
+Then, you likely will want to check out to make your own topic branch as to not work directly on the "live" branch, like so:
+
+
+ ➤ git checkout -b YOU/site
+
+And perform the git-gerrit init on this branch
+
+
+ ➤ git gerrit init -u ssh://YOU@asterix-gerrit.ics.uci.edu:29418/ -p incubator-asterixdb-site
## Making a change to the site
@@ -55,22 +62,20 @@
Once you have made your commit, push it to Gerrit for review:
- ➤ git push gerrit HEAD:refs/for/asf-site
+ ➤ git gerrit submit -b asf-site
-
-If no Change-Id is provided, "ERROR: missing Change-Id in commit message footer" is returned when attempting to push to Gerrit. The error description also contains a) a proposal for a Change-Id that can be pasted to the commit message and b) instructions how to install a commit-msg hook into the local git repository that will automatically add a Change-Id.
### Submitting the change to the live site
When the submitted review is committed in Gerrit, pull it and overwrite your current asf-site branch:
- ➤ git pull gerrit
+ ➤ git fetch gerrit
Then, push the exact commit from the Gerrit web interface to the ASF git repository. Do this with care! ASF git doesn't allow hard resets on branches, so whatever you push here is final.
- ➤ git push origin (SHA1 of submitted commit)
+ ➤ git push origin (SHA1 of submitted commit):asf-site
--
To view, visit https://asterix-gerrit.ics.uci.edu/680
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Gerrit-PatchSet: 3
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in incubator-asterixdb-site[asf-site]: Update site edit instructions
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Update site edit instructions
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asf-site/35/
--
To view, visit https://asterix-gerrit.ics.uci.edu/680
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ifea646ac1926bf3351391cd39b134d2bd2042ad6
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No