From e29ca03c5613a3ebeb2b4187f4c82753b75157da Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Mon, 12 Oct 2020 14:14:26 +0200 Subject: [PATCH] template update --- .../merge_request_templates/Code Approval.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab/merge_request_templates/Code Approval.md b/.gitlab/merge_request_templates/Code Approval.md index fed15a38e..ed076c02e 100644 --- a/.gitlab/merge_request_templates/Code Approval.md +++ b/.gitlab/merge_request_templates/Code Approval.md @@ -1,15 +1,18 @@ -The code approval procedure is described in the [code approval procedure wiki](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/wikis/Code-Approval-Procedure) +Issues: Closes #.... -- [ ] The MR is without WIP (work in progress) status -- [ ] Make sure the most recent CI jobs (config, quality, build, tests) all run fine with no failures +The code approval procedure is described in the wiki: [Code approval procedure wiki](https://gitlab.ikp.kit.edu/AirShowerPhysics/corsika/-/wikis/Code-Approval-Procedure) + +- [ ] The MR is without `WIP/Draft` status +- [ ] Make sure the most recent CI jobs (config, quality, build_test_example) all run fine with no failures - 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 all 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 decreases (!). It should always stay, or increase. If it decreased --> ask contributor to add further unit tests, and check coverage report. +- [ ] Make sure also the jobs with MR-label `ready for code review` succeed. This includes the optional jobs, in particular 'coverage', 'release-clang-8", "release-u-18.04" and make sure no problems occur. You may have to trigger a pipeline manually to check this. +- [ ] Check in the "coverage" job output that the coverage did not decrease. It should always stay, or increase. If it decreased --> ask contributor to add further needed unit tests, and check coverage report. - On the MR page, open the "Open in Web IDE" tool - [ ] Check if the provided solution solves the Issue, discuss on gitlab - [ ] Check that all changes are actually related to the issue - [ ] There are no debug statements left, not even commented out - [ ] Check all changes for coding rules and guidelines -- When all above is done - - [ ] **Add label "Code Review Finished"** +- When all above is done: + - **Add MR label "Code Review Finished"** + -- GitLab