... | @@ -4,7 +4,7 @@ We have stable production branches (currently 11.0, 12.0). Merging changes direc |
... | @@ -4,7 +4,7 @@ We have stable production branches (currently 11.0, 12.0). Merging changes direc |
|
|
|
|
|
Development process happens on the development branches (named `11.0-<branch name>`, `12.0-<branch name>` where `<branch name>` is a description of features developers work on).
|
|
Development process happens on the development branches (named `11.0-<branch name>`, `12.0-<branch name>` where `<branch name>` is a description of features developers work on).
|
|
|
|
|
|
New feature development example:
|
|
### New feature development example:
|
|
|
|
|
|
`git checkout -b 11.0-new-feature` - this will create and checkout a new branch `11.0-new-feature`
|
|
`git checkout -b 11.0-new-feature` - this will create and checkout a new branch `11.0-new-feature`
|
|
|
|
|
... | @@ -12,10 +12,9 @@ After some changes made: |
... | @@ -12,10 +12,9 @@ After some changes made: |
|
|
|
|
|
`git push -u origin 11.0-new-feature` - set upstream and push the changes to Gitlab
|
|
`git push -u origin 11.0-new-feature` - set upstream and push the changes to Gitlab
|
|
|
|
|
|
Automatic tests for pushed changes will start.
|
|
Tests will start automatically. Now go to Gitlab and create merge request. If you have not finish your work, mark merge request as WIP (work in progress) to prevent early merging.
|
|
Now developer goes to Gitlab and checkout if the tests are passed.
|
|
|
|
|
|
|
|
### Code Control
|
|
#### Code Control
|
|
|
|
|
|
Any code changes should pass the following stages to be merged into the main branch:
|
|
Any code changes should pass the following stages to be merged into the main branch:
|
|
|
|
|
... | @@ -31,3 +30,5 @@ Any code changes should pass the following stages to be merged into the main bra |
... | @@ -31,3 +30,5 @@ Any code changes should pass the following stages to be merged into the main bra |
|
3. Automatic check of translation coverage
|
|
3. Automatic check of translation coverage
|
|
4. Automatic review app deployment
|
|
4. Automatic review app deployment
|
|
5. Manual testing and code review
|
|
5. Manual testing and code review
|
|
|
|
|
|
|
|
After all tests and code reviews are passed, the branch will be merged into the stable 11.0 branch. |
|
|
|
\ No newline at end of file |