Skip to content

Commit

Permalink
Update CONTRIBUTING.md with info about pull request testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Rønne Petersen committed Apr 19, 2014
1 parent 29a2d0d commit 86c7d75
Showing 1 changed file with 33 additions and 11 deletions.
44 changes: 33 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Guidelines
==========

Expand Down Expand Up @@ -32,18 +31,41 @@ file in this directory.

When contributing code, make sure that your contribution falls under
the appropriate license. For example, contributions to code licensed
under MIT X11 code, should be MIT X11 code.
under MIT/X11 code, should be MIT/X11 code.

The Runtime is a special case. The code is dual licensed by Xamarin
under both the GNU LGPL v2 license and is also available under
commercial terms. For the runtime, you should either sign an
The runtime (`mono/...`) is a special case. The code is dual-licensed
by Xamarin under both the GNU LGPL v2 license and is also available
under commercial terms. For the runtime, you should either sign an
agreement that grants Xamarin the rights to relicense your code under
other licenses other than the LGPL v2 or your contribution must be
made as an MIT X11 license which grants us the same rights, but
involves no paperwork.
made as an MIT/X11 license which grants us the same rights, but
involves no paperwork. For the latter case, please specify on your
commit(s) that you are licensing the changes under MIT/X11.

For other parts of the project that are dual-licensed, please state
on your commit(s) what license you are contributing the changes under.

Testing
=======

Pull requests go through testing on our [Jenkins server][2]. We will
usually only merge a pull request if it causes no regressions in a
test run there.

When you submit a pull request, one of two things happens:

* If you are a new contributor, Jenkins will ask for permissions (on
the pull request) to test it. A maintainer will reply to approve
the test run if they find the patch appropriate. After you have
submitted a few patches, a maintainer will whitelist you so that
all of your future pull requests are tested automatically.
* If you are a well-known, whitelisted contributor, Jenkins will go
ahead and test your pull request as soon as a test machine is
available.

Submitting Patches
==================
When your pull request has been built, Jenkins will update the build
status of your pull request. If it succeeded and we like the changes,
a maintainer will likely merge it. Otherwise, you can amend your pull
request to fix build breakage and Jenkins will test it again.

When Submitting patches to the dual-licensed portions, please specify
on the commit the license that the code is under.
[2] http://monojenkins.cloudapp.net

0 comments on commit 86c7d75

Please sign in to comment.