381
edits
m (Prepare for 2.6.0/2.7.0) |
|||
Line 24: | Line 24: | ||
# Jan/Jul 17th: Create new release branch, assign new version number to dev-stream, re-open streams | # Jan/Jul 17th: Create new release branch, assign new version number to dev-stream, re-open streams | ||
##Send a mail to the flightgear-devel mail-list, asking not to commit/push anything, declare the streams "closed" or "red" | ##Send a mail to the flightgear-devel mail-list, asking not to commit/push anything, declare the streams "closed" or "red" | ||
##Bump up the version-number of simgear/next, flightgear/next and fgdata/master to an even number (2. | ##Bump up the version-number of simgear/next, flightgear/next and fgdata/master to an even number (2.5.0 -> 2.6.0) | ||
##Compile and test drive FlightGear with the new version-number | ##Compile and test drive FlightGear with the new version-number | ||
##Commit the new version number to next (flightgear+simgear) and master(fgdata) | ##Commit the new version number to next (flightgear+simgear) and master(fgdata) | ||
##Tag (annotated) flightgear, simgear and fgdata with "version/2. | ##Tag (annotated) flightgear, simgear and fgdata with "version/2.6.0" | ||
##:''git tag -a version/2. | ##:''git tag -a version/2.6.0'' (Enter a wise comment) | ||
##Create the release branches on simgear, flightgear and fgdata named release/2. | ##Create the release branches on simgear, flightgear and fgdata named release/2.6.0 | ||
##:''git branch release/2. | ##:''git branch release/2.6.0'' | ||
##On the next/master branches, bump up the version-number of simgear, flightgear and fgdata to an odd number (2. | ##On the next/master branches, bump up the version-number of simgear, flightgear and fgdata to an odd number (2.6.0 -> 2.7.0) | ||
##Compile and test drive FlightGear with the new development version number | ##Compile and test drive FlightGear with the new development version number | ||
##Commit the changes of version-number to next/master | ##Commit the changes of version-number to next/master | ||
##Tag (annotated) flightgear, simgear and fgdata with "version/2. | ##Tag (annotated) flightgear, simgear and fgdata with "version/2.7.0" | ||
##:''git tag -a version/2. | ##:''git tag -a version/2.7.0'' (Enter a wise comment) | ||
##Push the branches next/master '''and''' release/2. | ##Push the branches next/master '''and''' release/2.6.0 '''and''' the tags upstream | ||
##:for flighgear, simgear and fgdata: ''git push origin release/2. | ##:for flighgear, simgear and fgdata: ''git push origin release/2.6.0'' | ||
##:for flighgear, simgear and fgdata: ''git push origin version/2. | ##:for flighgear, simgear and fgdata: ''git push origin version/2.6.0'' | ||
##:for flighgear, simgear and fgdata: ''git push origin version/2. | ##:for flighgear, simgear and fgdata: ''git push origin version/2.7.0'' | ||
##:for flightgear and simgear: ''git push origin next'' | ##:for flightgear and simgear: ''git push origin next'' | ||
##:for fgdata: ''git push origin master'' | ##:for fgdata: ''git push origin master'' | ||
Line 47: | Line 47: | ||
# Feb/Aug 1st: Start preparing the release notes and a press announcement | # Feb/Aug 1st: Start preparing the release notes and a press announcement | ||
# Feb/Aug 17th: Create binaries/installers, pack fgdata, publish files, announce new version, close the release-branch | # Feb/Aug 17th: Create binaries/installers, pack fgdata, publish files, announce new version, close the release-branch | ||
##Tag the release/2. | ##Tag the release/2.6.0 branches of simgear, flightgear and fgdata and push the tags. | ||
##:for flighgear, simgear and fgdata: ''git tag version/2. | ##:for flighgear, simgear and fgdata: ''git tag version/2.6.0-final'' | ||
##:for flighgear, simgear and fgdata: ''git push origin version/2. | ##:for flighgear, simgear and fgdata: ''git push origin version/2.6.0-final'' | ||
##Merge the branch release/2. | ##Merge the branch release/2.6.0 into '''master''' (<u>'''NOT'''</u> next) for flightgear and simgear and push the branch | ||
##:We don't have a next branch for fgdata, no merging of the release branch here. | ##:We don't have a next branch for fgdata, no merging of the release branch here. | ||
##:for flighgear and simgear: | ##:for flighgear and simgear: | ||
##:''git checkout -b master origin/master'' or ''git checkout master'' if you already have the local branch | ##:''git checkout -b master origin/master'' or ''git checkout master'' if you already have the local branch | ||
##:''git merge version/2. | ##:''git merge version/2.6.0-final | ||
##:''git push origin master'' | ##:''git push origin master'' | ||