Changes between Version 11 and Version 12 of SetupDev

Timestamp:

2012-11-20T20:58:19Z (12 years ago)

Author:

Pan Luo

Comment:

--

SetupDev

@@ -84 +84 @@
 You can/should  create local branch if you are working on a new feature or non-trivia bug fix. Then merge back to dev. You may use rebase or not depending on the complexity of the work.
 
-There are also some changes on Jenkins setup.  There are 5 jobs: iPeer_2.x, iPeer_3.x, iPeer_dev, iPeer_Release_2.x and iPeer_Release_3.x.
- * Any push to 2.x branch will trigger iPeer_2.x job. If the job success, iPeer_Release_2.x will be triggered and will publish a new version for 2.x.
- * Any push to master branch will trigger iPeer_3.x job. If the job success, iPeer_Release_3.x will be triggered and will publish a new version for 3.x
+There are also some changes on Jenkins setup.  There are 5 jobs: [http://ci.ctlt.ubc.ca/job/iPeer2/ iPeer2], [http://ci.ctlt.ubc.ca/job/iPeer3/ iPeer3], [http://ci.ctlt.ubc.ca/job/iPeer_dev/ iPeer_dev], [http://ci.ctlt.ubc.ca/job/iPeer_Release_2.x/ iPeer_Release_2.x] and [http://ci.ctlt.ubc.ca/job/iPeer_Release_3.x/ iPeer_Release_3.x].
+ * Any push to 2.x branch will trigger iPeer2 job. If the job success, iPeer_Release_2.x will be triggered and will publish a new version for 2.x.
+ * Any push to master branch will trigger iPeer3 job. If the job success, iPeer_Release_3.x will be triggered and will publish a new version for 3.x
  * Any push to dev branch will trigger dev job. No release will be published.
 
@@ -96 +96 @@
 
 NOTE: The branching strategy we are using is based on the page: http://nvie.com/posts/a-successful-git-branching-model/.
+
+== Workflow ==
+The standard workflow is as the following:
+* Pull the latest code
+{{{
+git pull
+}}}
+* Depending on the task, work on ''dev'' branch or create a local branch
+* Write some code
+* Rung unit tests and integration tests
+{{{
+phing test
+}}}
+* Run your own manual tests
+{{{#!div style="background: #dfd; border: solid 1px #8f8; float: right; padding: 0; margin: 0; width: 15em;"
+ '''Tip''': The ticket can be closed with a command in the [http://trac.edgewall.org/wiki/CommitTicketUpdater commit message].
+}}}
+* Merge back to dev branch (not necessary if working on ''dev'' branch)
+* Push the changes to github
+{{{
+git push
+}}}
+* Close any related [/report/1 tickets] if there is any
+
+
+==  Auto Deployment ==
+When a push is send to Github, it will trigger a build command on the [http://ci.ctlt.ubc.ca continuous integration server]. It will run the tests and checking, e.g. styles, code duplication, etc, to make sure everything works fine. If the build is failed, you should exam the code and fix it.
+
+If the build is successful, the CI server will deploy the code to our test server for further testing. Different branch will be deployed to different domain.
+* dev branch -> http://ipeerdev.ctlt.ubc.ca
+* master branch -> http://ipeerverf.elearning.ubc.ca
+* 2.x branch -> http://ipeerverfv2.elearning.ubc.ca