How the RM push
Jump to navigation
Jump to search
Here is the workflow of how the RM pushes a patch. A patch can be pushed when he get the status "passed QA". This status can be given by anyone from the QA team.
Patches are usually pushed in the order they pass QA : 1st QAed, 1st pushed.
Create a new branch for your patch(es):
- git checkout -b new/bug_NNNN
Apply patches to your new branch:
- git bz apply NNNN
Check
- fix updatedatabase & version number if applicable
Test the patch
- test
Run unit tests. Not all, but those who are relevant (are template valid ? is the code perlcritic compliant ? ...)
Add RM signature on the patch:
- git commit --amend -s
Push the branch to official repo:
- git push gitmain@git.koha-community.org:koha.git HEAD:new/bug_NNNN
Fetch the repo. That will retrieve a origin/new/bug_NNNN branch i'll use immediately for merging main:
- git fetch
Switch to main:
- git checkout main
Merge the branch
- git merge origin/new/bug_NNNN
and push the branch onto main
- git push gitmain@git.koha-community.org:koha.git HEAD:main
Push fetch the repo again to let git know your local main is synch-ed with official main (not necessary, but handy)
- git fetch
Firefox stuff, open the bug and update status
- open http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=NNNN
- set status to "patch pushed", add a comment "patch pushed, please test"
- update version number if applicable (rel_3_6 if the patch should be applied on a 3.6, rel_3_8 if the patch is related to a new features that will be in 3.8 only)
Copyright assignment checking:
- check if author must be added into history.txt