|
|
If we are in a position where new developments or bug fixes need to be merged from a branch back to master, follow the rules defined here. If there is anything unclear also in specific cases, we can always discuss in our meetings.
|
|
|
|
|
|
- Only Merge Requests (MR) with the Tag "ready for code review", and without WIP status are reviewed
|
|
|
- Make sure the CI jobs all run fine
|
|
|
- Also run the extra optional jobs "coverage", "release-clang-8", "release-u-18.04" and make sure no problems occur
|
... | ... | @@ -11,3 +13,20 @@ |
|
|
- Check if the provided solution solves the Issue, discuss on gitlab
|
|
|
- If useful discuss ongoing MR review in CORSIKA meeting
|
|
|
- Approve on gitlab
|
|
|
|
|
|
Concrete rule: Make a copy of the below section in the MR discussion section and go through all the points:
|
|
|
```
|
|
|
- [] Only Merge Requests (MR) with the Tag "ready for code review", and without WIP status are reviewed
|
|
|
- [] Make sure the CI jobs all run fine
|
|
|
- [] Also run the extra optional jobs "coverage", "release-clang-8", "release-u-18.04" and make sure no problems occur
|
|
|
- [] Check in the "coverage" job output that the coverage did not decline (!). It should always stay, or increase.
|
|
|
- [] Make sure clang-format was used, if necessary by checking out the branch and running `./do-clang-format.py` and check for any reported file. If there are files:
|
|
|
- [] Ask the author of the MR to run `do-clang-format.py --apply`
|
|
|
- [] Make sure the copyright headers are there. If necessary by checking out the branch and running `./do-copyright.py --check`. If there are problems:
|
|
|
- [] Ask the author of the MR to fix
|
|
|
- [] From the MR page, open the "Open in Web IDE" tool
|
|
|
- [] Check all changes for coding rules and guidelines
|
|
|
- [] Check if the provided solution solves the Issue, discuss on gitlab
|
|
|
- [] If useful discuss ongoing MR review in CORSIKA meeting
|
|
|
- [] Approve on gitlab
|
|
|
``` |