Patching a Branch: Difference between revisions

From genomewiki
Jump to navigationJump to search
No edit summary
(Replacing page with 'This page is no longer maintained.')
 
Line 1: Line 1:
Edited to use Git and cherry-picking.
This page is no longer maintained.
 
'''How? ("Who" in parenthesis)'''
 
* ('''QA'''): Find an error in the binaries, determine if it needs to be patched, and alert the Developer.
* ('''Developer'''): Fix the error (and get a second opinion on your fix from another developer).  Let the QA person know that it is fixed.
* ('''QA'''): Verify the developer's fix on hgwdev.  Send email to Build-meister (cc'ing browser-qa and developer) with revision number of the fix and patch request (including an explanation of the problem and the fix and the CGIs that will be affected).
* ('''Build-Meister'''): Check the Git log to make sure that you are making the correct change.
hgwbeta> cd $BUILDDIR/v${BRANCHNN}_branch/kent/src
hgwbeta:/data/tmp/releaseBuild/v190_branch/kent/src> git log hg/someCgi/someFile.c
* ('''Build-Meister'''): Tell the program which file and version you want to change to.
hgwbeta> cd $WEEKLYBLD
hgwbeta:/cluster/bin/build/scripts> vi CherryPickCommits.conf
** This is a list and you can have more than one line if you need.
** Edit this file to include the git commit hash id like so:
96b0dc9826d589e09daf2bd1a36ef513c91255b1
* ('''Build-Meister'''): Do a test run and verify that everything is set up correctly:
./cherryPickCommits.csh
* ('''Build-Meister'''): If it is correct, run it for real:
./cherryPickCommits.csh real
* ('''Build-Meister'''): Determine which CGIs are affected by this file change:
hgwbeta> cd /usr/local/apache/cgi-bin
hgwbeta:/usr/local/apache/cgi-bin> ./dependencies fileName.c
* ('''Build-Meister'''): Go to the current build:
hgwbeta> cd $BUILDDIR
* ('''Build-Meister'''): Determine the current branch number. It will be the most recent directory that looks like "v---_branch".
hgwbeta:/data/tmp/releaseBuild> ls -ltr
* ('''Build-Meister'''): Do a 'make' in the library directory, if necessary. If the file change was a lib file, then do a make in the corresponding lib directory:
hgwbeta:/data/tmp/releaseBuild/v999_branch/kent/src/hg/lib> make
** -or-
hgwbeta:/data/tmp/releaseBuild/v999_branch/kent/src/lib> make
* ('''Build-Meister'''): If only one or two programs are impacted by the change, do a 'make alpha' in their CGI directories:
hgwbeta> cd $BUILDDIR/v${BRANCHNN}_branch/kent/src
hgwbeta:/data/tmp/releaseBuild/v999_branch/kent/src> cd path/to/c/file
hgwbeta:/data/tmp/releaseBuild/v999_branch/kent/src/hg/hgTracks> make alpha
** -or-
* ('''Build-Meister'''): If all or many are impacted, do a 'make alpha' in hg/:
hgwbeta:/data/tmp/releaseBuild/v999_branch/kent/src/hg> make alpha
* ('''Build-Meister'''): Reply to the email to the Developer and browser-qa that the tag has been moved and binaries made on hgwbeta.
* ('''QA'''): Test the change on hgwbeta.
* ('''QA'''): Reply to the email about the efficacy of the change.
 
[[Category:Browser QA]]

Latest revision as of 19:21, 10 March 2011

This page is no longer maintained.