Contributing to Migration Manager
This is the process for committing code into master. There are of course exceptions to these rules, for example minor changes to comments and documentation, fixing a broken build etc.
- Make sure you have signed the Lightbend CLA. If not, please sign it online.
- Before starting work on a feature or a fix, make sure that there is a ticket for your work in the project's issue tracker. If not, create it first.
- Fork the project and perform your work in a Git branch.
- When the feature or fix is completed you should open a Pull Request on GitHub.
- The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Lightbend. Outside contributors are encouraged to participate in the review process, it is not a closed process.
- After the review you should fix the issues as needed, pushing the changes as additional commits, iterating until the reviewers give their thumbs up.
- Once the code has passed review, it’s ok to amend commits as needed (see the ‘Creating Commits And Writing Commit Messages’ section below).
- The Pull Request can be merged into the master branch.
- If the code change needs to be applied to other branches as well, create pull requests against those branches with the change rebased onto the respective branches and await successful verification by the continuous integration infrastructure; then merge those pull requests.
- Once everything is said and done, associate the ticket with the “earliest” release branch (i.e. if back-ported so that it will be in release x.y.z, find the relevant milestone for that release) and close it.
Pull Request Requirements
For a Pull Request to be considered at all it has to meet these requirements:
- Live up to the current code standard:
- Regardless of whether the code introduces new features or fixes bugs or regressions, it must have comprehensive tests. The only exception is UI code, because our infrastructure allows running tests only in a headless environment.
- The code must be well documented.
- User documentation should be provided for all new features:
- Fork the Wiki repository and perform your work in a Git branch.
- In the Pull Request’s description, add a link to a branch containing the updated documentation so that it can be reviewed together with the code.
- Rebase your branch on the latest master if it can’t be cleanly merged.
- The Pull Request validator successfully builds. What the Pull Request validator does is make sure that the current master branch will still compile fine after the currently in-review Pull Request is merged.
- The Pull Request validator will start within 1 hour from the moment you opened the Pull Request.
- If you want to force the Pull Request validator to run again, you can do so by adding a new comment in the Pull Request with the following text:
PLS REBUILD ALL. Again, the Pull Request validator will kick-in within 1 hour.
If these requirements are not met then the code should not be merged into master, or even reviewed - regardless of how good or important it is. No exceptions. For any question, please drop us a message in the mima-user mailing list
Creating Commits And Writing Commit Messages
Follow these guidelines when creating public commits and writing commit messages.
- If your work spans multiple local commits (for example; if you do safe point commits while working in a feature branch or work in a branch for long time doing merges/rebases etc.) then please do not commit it all but rewrite the history by squashing the commits into as few as necessary. Every commit should be able to be used in isolation, cherry picked etc.
- First line should be a descriptive sentence what the commit is doing. It should be possible to fully understand what the commit does by just reading this single line. It is not ok to only list the ticket number, type "minor fix" or similar. If the commit is a small fix, then go to 4. Otherwise, keep reading.
- Following the single line description should be a blank line followed by a detailed description of the problem the commit solves and justify your solution. For more info, read this article: Writing good commit messages.
- Add keywords for your commit (depending on the degree of automation we reach, the list may change over time):
Review by @gituser- if you want to notify someone on the team. The others can, and are encouraged to participate.
Fix #ticket- if the commit fixes a ticket (or
Fix #ticket1, ...,
Fix #ticketN, if it fixes several tickets).
Corrected semantic highlighting for methods Details 1 Details 2 Details 3 Fix #2731, Fix #2732, Re #2733