... | ... | @@ -3,19 +3,31 @@ If we are in a position where new developments or bug fixes need to be merged fr |
|
|
```mermaid
|
|
|
graph TD;
|
|
|
subgraph "Code contributor"
|
|
|
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];
|
|
|
A0[Working on MR/branch] -- Finished main work --> A2[Make sure all conditions for code review and approval are met];
|
|
|
A2 -- Ok --> A3[Remove WIP status];
|
|
|
A3 --> A4[Inform developers/corsika-devel 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];
|
|
|
|
|
|
A4 --> B0[Suited developers picked for code review];
|
|
|
B0 --> B1[Reviewers are attached to the MR with their name tags];
|
|
|
|
|
|
B1 --> C1[Reviewer copies task list from below into MR];
|
|
|
|
|
|
subgraph "Code reviewer"
|
|
|
C1 --> C2[Reviewer checks each item on task list];
|
|
|
C2 --> C3[Final check mark means APPROVED for merging];
|
|
|
C2 --> C3[Reviewer discusses with contributor];
|
|
|
C3 --> C4[Final check mark means REVIEW IS FINISHED];
|
|
|
C4 --> C5[Add label `Approved for merging`];
|
|
|
end
|
|
|
|
|
|
subgraph "Project owner"
|
|
|
C5 --> D1[Checks the MR and the review]
|
|
|
D1 --> D2[Rediscusses with contributor and reviewer]
|
|
|
D1 --> D3[Put MR on agenda of next meeting]
|
|
|
D1 --> D4[MR is merged into master, and MR is closed]
|
|
|
D2 --> D4
|
|
|
D3 --> D4
|
|
|
end
|
|
|
C3 --> D[Developer merges code into master, closes MR]
|
|
|
```
|
|
|
|
|
|
Until all boxes below are checked the reviewer gets back to the contributor and asks for specific fixes. If there are larger issues either the reviewer or the contributor can both discuss this also in CORSIKA meetings or via the corsika-devel mailing list.
|
... | ... | |