Ej-server uses “master” as the main development branch and tags for stable releases. Generally, we want to move code to the master as soon as possible, but we need some discipline to make it work. The master is locked and submissions of new features are done using pull requests.
For each issue to be solved, follow the procedure below:
In case of your development environment isn’t already built, then clone the repository, follow the installation guide at README.rst. Install the commit hooks to statically check your code before each commit:
$ inv install-hooks
Checkout to a branch you created to solve your issue. For simple things,
use the generic dev branch, otherwise, describe what you are going to do
e.g.:
$ git checkout -b facebook-login
Always run all tests before any commit,otherwise your pull request will not be merged!
$ pytest # backend tests
After you finished, open a pull request MASTER:
ejplatform/ej-server/<your-branch> ==> ejplatform/ej-server/master
and wait until Travis CI, GitLab CI and Code Climate run all the integration tests. Your PR should have a small explanation of what it does preferably with a link to the originating issue. Please tell explicitly if the PR closes that issue or not and move the issue to the proper slot on the Projects board.
Any contributor can merge your PR after your tests passed. Ideally, we can use a second pair of eyes to review the code, specially for tricky code. But, if you are in hurry, you can accept your own PR.
If changes were made in a branch different from dev, then delete it after
your PR gets merged.
dev is the branch to go for small maintenance contributions and it is likely
that more than one developer will be working on it simultaneously.
Acceptable work to do in dev includes: