8,564
edits
(Present tense) |
(Update for 2.8.0 release) |
||
Line 28: | Line 28: | ||
##Post an update to the forum topic | ##Post an update to the forum topic | ||
##Change the content of wiki template at [[Template:GitStatus]] to <code><nowiki>{{GitStatus:closed}}</nowiki></code> | ##Change the content of wiki template at [[Template:GitStatus]] to <code><nowiki>{{GitStatus:closed}}</nowiki></code> | ||
##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.7.0 -> 2.8.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 <tt>version/2. | ##Tag (annotated) flightgear, simgear and fgdata with <tt>version/2.8.0</tt> | ||
##:''git tag -a version/2. | ##:''git tag -a version/2.8.0'' (Enter a wise comment) | ||
##Create the release branches on simgear, flightgear and fgdata named <tt>release/2. | ##Create the release branches on simgear, flightgear and fgdata named <tt>release/2.8.0</tt> | ||
##:''git branch release/2. | ##:''git branch release/2.8.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.8.0 -> 2.9.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.9.0" | ||
##:''git tag -a version/2. | ##:''git tag -a version/2.9.0'' (Enter a wise comment) | ||
##Push the branches next/master '''and''' release/2. | ##Push the branches next/master '''and''' release/2.8.0 '''and''' the tags upstream | ||
##:for flightgear, simgear and fgdata: ''git push origin release/2. | ##:for flightgear, simgear and fgdata: ''git push origin release/2.8.0'' | ||
##:for flightgear, simgear and fgdata: ''git push origin version/2. | ##:for flightgear, simgear and fgdata: ''git push origin version/2.8.0'' | ||
##:for flightgear, simgear and fgdata: ''git push origin version/2. | ##:for flightgear, simgear and fgdata: ''git push origin version/2.9.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 53: | Line 53: | ||
# '''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. | ||
## Generate latest '''getstart.pdf''', push the PDF to fgdata/master - and cherry-pick to the '''release branch'''. Generate latest '''getstart''' HTML, push PDF and HTML to the MapServer site. | ## Generate latest '''getstart.pdf''', push the PDF to fgdata/master - and cherry-pick to the '''release branch'''. Generate latest '''getstart''' HTML, push PDF and HTML to the MapServer site. | ||
##Tag the release/2. | ##Tag the release/2.8.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.8.0-final'' | ||
##:for flighgear, simgear and fgdata: ''git push origin version/2. | ##:for flighgear, simgear and fgdata: ''git push origin version/2.8.0-final'' | ||
##Merge the branch release/2. | ##Merge the branch release/2.8.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.8.0-final | ||
##:''git push origin master'' | ##:''git push origin master'' | ||
Line 87: | Line 87: | ||
=== Bug fix committing policy === | === Bug fix committing policy === | ||
Fixes for bugs during the shakedown test of the release branch may be applied to the branches next or release/2. | Fixes for bugs during the shakedown test of the release branch may be applied to the branches next or release/2.8.0. | ||
A fix goes into release/2. | A fix goes into release/2.8.0 if the development of next has moved forward and this fix does not apply there. It also goes into the release branch if there will be a better fix for next. | ||
A fix goes into next if it is also solves an issue for the next version. Cherry-pick this commit into the release/2. | A fix goes into next if it is also solves an issue for the next version. Cherry-pick this commit into the release/2.8.0 branch. | ||
'''DO NOT''' merge next into release/2. | '''DO NOT''' merge next into release/2.8.0 or vice versa. Most likely, there will be commits that are not welcome in or even break the other branch. | ||
=== Bug tracking === | === Bug tracking === | ||
The [http://flightgear-bugs.googlecode.com bugtracker] will be our primary source for the bug fixing period. Bugs reported on the mailing list or forum will not be tracked! Reporters shall be requested to file a bug report at the bugtracker. Bugs shall be assigned a priority and a keyword to make the assignment to a developer easier. Bug reports that can't be confirmed or need more input from the reporter to get fixed will be assigned a new state "stalled" and only processed after more information has been provided. Bugs assigned a high priority will be downgraded, if no progress has been made over a certain amount of time. This is to prevent the release from being blocked by a bug that no developer is able (or willing) to fix. The only exception is "does not compile for one of the major platforms", which certainly is a release-blocker. | The [http://flightgear-bugs.googlecode.com bugtracker] will be our primary source for the bug fixing period. Bugs reported on the mailing list or forum will not be tracked! Reporters shall be requested to file a bug report at the bugtracker. Bugs shall be assigned a priority and a keyword to make the assignment to a developer easier. Bug reports that can't be confirmed or need more input from the reporter to get fixed will be assigned a new state "stalled" and only processed after more information has been provided. Bugs assigned a high priority will be downgraded, if no progress has been made over a certain amount of time. This is to prevent the release from being blocked by a bug that no developer is able (or willing) to fix. The only exception is "does not compile for one of the major platforms", which certainly is a release-blocker. | ||
Bugs that were present in the latest stable release, and now considered "fixed", should be assigned a milestone label, corresponding with the upcoming stable release number. By doing so, they'll end up in [http://code.google.com/p/flightgear-bugs/issues/list?can=1&q=label%3AMilestone-2. | Bugs that were present in the latest stable release, and now considered "fixed", should be assigned a milestone label, corresponding with the upcoming stable release number. By doing so, they'll end up in [http://code.google.com/p/flightgear-bugs/issues/list?can=1&q=label%3AMilestone-2.8.0 the list of fixed bugs]. | ||
=== Tasks and owners === | === Tasks and owners === | ||
Line 151: | Line 144: | ||
|- | |- | ||
! rowspan="2" | Announce the new version to the public | ! rowspan="2" | Announce the new version to the public | ||
| Write a changelog: [[Changelog 2. | | Write a changelog: [[Changelog 2.8.0]] | ||
| All developers | | All developers | ||
|- | |- |