Page History

Example for 4.14.0.0 **new** release

$ git checkout 4.14.0.0-RC20200511T1503 # checkout the RC branch
$ git tag 4.14.0.0 # the tag has already been created by build_asf.sh
$ git push origin 4.14.0.0 # push the tag to origin
# Rename the RC branch and set the next version in this new branch
$ git branch -m 4.14.0.0-RC20200511T1503 4.14
$ git push -u origin 4.14
$ bash tools/build/setnextversion.sh -b 4.14 -v 4.14.1.0-SNAPSHOT -s /root/cloudstack # replace with local working directory
$ grep -r "4.14.0.0" . # doublecheck by grepping for the older POMs version - should return a few git refs and comments - not the POMs/code - and if all good push
$ git push origin 4.14
# Merge the new branch into the master AND set the nextversions in the master branch
$ git checkout master
$ git pull
$ git merge 4.14
$ bash tools/build/setnextversion.sh -b master -v 4.15.0.0-SNAPSHOT -s /root/cloudstack #replace with local working directory
$ grep -r "4.14.1.0" . # doublecheck by grepping for the older POM version - should return a few git refs and comments - not the POMs/code - and if all good push
$ git push origin master
# delete older RC branches (repeat for all RC branches)
$ git branch -d 4.14.0.0-RC20200511T1503 # delete the RC branch locally
$ git push origin :4.14.0.0-RC20200511T1503 # deletes the RC branch on origin

Example for 4.13.1.0 **maintenance** release

$ git checkout 4.13.1.0-RC20200423T1917 # checkout the RC branch
$ git tag 4.13.1.0 # the tag has already been created by build_asf.sh
$ git push origin 4.13.1.0 # push the tag to origin
# Merge 4.13.1.0-RC20200423T1917 into the 4.13 AND set the nextversions in the current/4.13 branch
$ git checkout 4.13
$ git pull
$ git merge 4.13.1.0-RC20200423T1917
$ bash tools/build/setnextversion.sh -b 4.13 -v 4.13.2.0-SNAPSHOT -s /root/cloudstack #replace with local working directory
$ grep -r "4.13.1.0" . # doublecheck by grepping for the older POM version - should return a few git refs and comments - not the POMs/code - and if all good push
$ git push origin 4.13
# delete older RC branches (repeat for all RC branches) - BUT better NOT delete the voted RC branch before generating the API doc - see below note on updateupdating http://cloudstack.apache.org/ site.
$ git branch -d 4.13.1.0-RC20200423T1917 # delete the RC branch locally
$ git push origin :4.13.1.0-RC20200423T1917 # deletes the RC branch on origin