... | ... | @@ -20,22 +20,26 @@ graph TD; |
|
|
A0[Working on MR/branch] -- Finished main work --> A1[Remove WIP status];
|
|
|
A1 --> A2[Make sure all conditions for code review and approval are met];
|
|
|
A2 -- Ok --> A3[Add MR tag 'ready for code review'];
|
|
|
A3 --> A4[Inform developers that code review can proceed];
|
|
|
end
|
|
|
A4 --> B0[A suited developer is picked for code review];
|
|
|
B0 --> C1[Reviewer copies task list from below into MR];
|
|
|
subgraph "Code reviewer"
|
|
|
A3 --> B0[A suited developer is picked for code review];
|
|
|
B0 --> B1[Reviewer copies task list from below into MR];
|
|
|
B1 --> B2[Reviewer checks each item on task list];
|
|
|
B2 --> B3[Final check means APPROVED for merging];
|
|
|
C1 --> C2[Reviewer checks each item on task list];
|
|
|
C2 --> C3[Final check means APPROVED for merging];
|
|
|
end
|
|
|
C3 --> D[Developer merges code into master, closed MR]
|
|
|
```
|
|
|
|
|
|
|
|
|
Concrete rule: Make a copy of the below section in the MR discussion section and go through all the points:
|
|
|
Concrete rules are listed here. 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
|
|
|
- [] The MR has the Tag "ready for code review", and is without WIP status
|
|
|
- [] Make sure the most recent CI jobs (config, quality, build, tests) all run fine
|
|
|
- if "check clang-format" failed: the code contributor has to run `./do-clang-format.py --apply` eventually with the `--all` option
|
|
|
- if "check copyright" failed the code contributor has to run`./do-copyright.py --add=20xy`
|
|
|
- [] 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.
|
|
|
- [] Check in the "coverage" job output that the coverage did not decreased (!). 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:
|
... | ... | |