Skip to content

Commit

Permalink
Merge pull request #8 from mitechie/update-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
jujugui committed Dec 4, 2013
2 parents c0ecf10 + 5187cef commit f08de1e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
7 changes: 4 additions & 3 deletions NEWS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ News
====


0.1a
0.1
-----

*Release date: TBD *
*Release date: Dec 4th 2013 *

* Example news entry for a released version
* Initial project is up and works via cli command provided.
* Future work will setup the web server and Github comment hook tracking work.

7 changes: 5 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Process
--------

- Pull request is created
- Code review happens and tests are run from an outside Jenkins job.
- Code review happens and tests are run from an outside Jenkins job. (We use
the Github pull request builder plugin)
- Once code receives a LGTM, the author places a keyword "$$merge$$" into a
final comment on the pull request.
- This webservice, via a hook notification Github, catches this and triggers a
Expand All @@ -35,7 +36,7 @@ server. The steps below walk through a sample setup process.
cd jenkins-github-lander
make all
make development.ini
# Hack the ini settings for the jenkins server and the github project/bot user.
# Hack the INI settings for the jenkins server and the github project/bot user.

# Add cron job per README

Expand Down Expand Up @@ -137,8 +138,10 @@ landing might not match the real order of comments on the pull requests.

*/3 * * * * cd /$path/to/service/venv/ && ./bin/lander-check-pulls --ini development.ini


Running webservice Manually
----------------------------

Currently the only way it works is to run manually. Copy the `sample.ini` file
into `development.ini` and update the config for your jenkins/github
configuration.
Expand Down

0 comments on commit f08de1e

Please sign in to comment.