diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-15 13:31:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 13:31:59 +0000 |
| commit | 2a376579f37e494978e833eb6eb21be6cbda04e4 (patch) | |
| tree | d7a6262454e477ef60bb1444b342c7c7d99f5e07 | |
| parent | Merge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff) | |
| parent | CONTRIBUTING.rst: fix CI info (diff) | |
| download | synapse-2a376579f37e494978e833eb6eb21be6cbda04e4.tar.xz | |
Merge pull request #3003 from matrix-org/rav/fix_contributing
CONTRIBUTING.rst: fix CI info
Diffstat (limited to '')
| -rw-r--r-- | CONTRIBUTING.rst | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 2a88647ca3..c6ee16efc7 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -30,8 +30,12 @@ use github's pull request workflow to review the contribution, and either ask you to make any refinements needed or merge it and make them ourselves. The changes will then land on master when we next do a release. -We use Jenkins for continuous integration (http://matrix.org/jenkins), and -typically all pull requests get automatically tested Jenkins: if your change breaks the build, Jenkins will yell about it in #matrix-dev:matrix.org so please lurk there and keep an eye open. +We use `Jenkins <http://matrix.org/jenkins>`_ and +`Travis <https://travis-ci.org/matrix-org/synapse>`_ for continuous +integration. All pull requests to synapse get automatically tested by Travis; +the Jenkins builds require an adminstrator to start them. If your change +breaks the build, this will be shown in github, so please keep an eye on the +pull request for feedback. Code style ~~~~~~~~~~ @@ -115,4 +119,4 @@ can't be accepted. Git makes this trivial - just use the -s flag when you do Conclusion ~~~~~~~~~~ -That's it! Matrix is a very open and collaborative project as you might expect given our obsession with open communication. If we're going to successfully matrix together all the fragmented communication technologies out there we are reliant on contributions and collaboration from the community to do so. So please get involved - and we hope you have as much fun hacking on Matrix as we do! \ No newline at end of file +That's it! Matrix is a very open and collaborative project as you might expect given our obsession with open communication. If we're going to successfully matrix together all the fragmented communication technologies out there we are reliant on contributions and collaboration from the community to do so. So please get involved - and we hope you have as much fun hacking on Matrix as we do! |