Commit 843e3808 authored by Heather Ellsworth's avatar Heather Ellsworth

Cleaning up changes to Contributing page

Expanding on many topics of contributing

Adding missing back tick and elaborating on WIP documentation

Further cleanups and adding a mention of the Contributing page on the Volunteering page
parent b873f06a
.. _contributing:
Contributing
============
We welcome merge requests and issues being filed in our `code repositories <https://source.puri.sm/Librem5/>`_. Typically, issues get filed under the project that the issue relates to and you can browse our `list of projects <https://source.puri.sm/Librem5/>`_. For example, if you find an issue with the documentation, you can file an issue under the `developer docs <https://source.puri.sm/Librem5/developer.puri.sm/issues>`_ project. An issue can be any mistake you found in the project, e.g. a crash, a bug, or even a typo. You are welcome to file an issue when you want to make us aware of some important topic relating to the project as well.
Aside from project specific issues, we do have an `Apps_issues <https://source.puri.sm/Librem5/Apps_Issues>`_ project to track tasks like applications to port to the phone or issues with them. Here you can add a task for a particular app to be ported to the phone. However, be sure to search our `list of specific projects <https://source.puri.sm/Librem5/>`_ first before opening an issue under `Apps_issues <https://source.puri.sm/Librem5/Apps_Issues>`_.
If you wish to own an issue, you will need additional permissions in our GitLab so please reach out in the community/librem-5 Matrix room and ask for a team member to grant you the "Reporter" role for the relevant project.
Repository Guidelines
*********************
If you have a repository that you maintain but expect others to contribute to, then it is helpful for newcomers to know who to contact when they have questions regarding that repository. For this reason, we would like every repository to contain a `doap <https://en.wikipedia.org/wiki/DOAP>`_ file with the maintaner field filled out. Optionally, if you know of someone that will regularly review your merge requests, then the helper field should also be completed. For a list of supported doap fields, see `here <https://en.wikipedia.org/wiki/DOAP>`_ but here is an example file you can modify to match your project::
<?xml version="1.0" encoding="UTF-8"?>
<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
xmlns:gnome="http://api.gnome.org/doap-extensions#"
xmlns="http://usefulinc.com/ns/doap#">
<name>YOUR PROJECT</name>
<shortname>YOUR PROJECT</shortname>
<shortdesc>DESCRIPTION OF YOUR PROJECT
<homepage rdf:resource="LINK TO CODE" />
<license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
<programming-language>LANG</programming-language>
<maintainer>
<foaf:Person>
<foaf:name>MAINTAINER'S NAME</foaf:name>
<foaf:mbox rdf:resource="mailto:MAINTAINER'S EMAIL" />
</foaf:Person>
</maintainer>
<helper>
<foaf:Person>
<foaf:name>FREQUENT REVIEWER NAME</foaf:name>
<foaf:mbox rdf:resource="mailto:FREQUENT REVIEWER EMAIL" />
</foaf:Person>
</helper>
</Project>
Be sure to adapt the above template to match your project info.
Submitting Patches
******************
This section describes the workflow for submitting patches followed by the Librem 5 team.
The "production" repository will be in the https://source.puri.sm/Librem5/ space. A user that wishes to patch the code and make a merge request should do the following before submitting a merge request:
* Fork the desired repository into your own space and clone your new fork.
* Make a feature branch that is a pristine copy of the master branch.
* Make the code changes on this feature branch and test.
* When you are ready for the changes to be merged back into the production repository, make a merge request from your feature branch to the original project's master branch.
Making Merge Requests
*********************
By making a merge request (MR) you are letting others know that your change has been tested and you feel it is ready to be live. Since MRs should be reviewed by another person and in order to minimize misspent effort, we have come up with a short set of guidelines around merge requests.
* In the merge request, add a sign off line signifying that you agree that your work is used under the license or project being contributed to: ``Signed-off-by: Random J Developer <random@developer.example.org>``
* Anyone that is making a MR should have tested their change.
* Alert someone to review the MR.
* While you may require more than one reviewer (depends on the change), only one tester is required.
.. note:: If you have a MR that depends on another outstanding MR (or if you only want feedback without a merge), prepend your MR title with "WIP". For more info on WIP, see `the WIP documentation <https://docs.gitlab.com/ee/user/project/merge_requests/work_in_progress_merge_requests.html>`_
Reviewing Merge Requests
************************
Follow these steps to succesfully review someone's MR:
* Build and test the change in question.
* Provide feedback in the MR discussion. This is where you would mention additional changes needed.
* Once all changes are approved, the reviewer should acknowledge that they tested it in the MR discussion.
* Merge the request.
Do NOT merge the request if any of these are true:
* The MR has "WIP" in the title. These MRs do not have to pass tests and reviewers are meant to provide feedback only.
* If no one has built and tested the change
* If there are unresolved discussions.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment