20,741
edits
Release plan: Difference between revisions
→Detailed time schedule and checklist: update examples for upcoming 3.0 release
(→Detailed time schedule and checklist: update examples for upcoming 3.0 release) |
|||
| Line 24: | Line 24: | ||
##Create a "release preperations" topic at the forum and make it a "Global Announcement" | ##Create a "release preperations" topic at the forum and make it a "Global Announcement" | ||
##Change the content of wiki template at [[Template:GitStatus]] to <code><nowiki>{{GitStatus:frozen}}</nowiki></code> | ##Change the content of wiki template at [[Template:GitStatus]] to <code><nowiki>{{GitStatus:frozen}}</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.9.0 -> 3.0.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/ | ##Tag (annotated) flightgear, simgear and fgdata with <tt>version/3.0.0</tt> | ||
##:''git tag -a version/ | ##:''git tag -a version/3.0.0'' (Enter a wise comment) | ||
##Push the branches next/master '''and''' the tags upstream | ##Push the branches next/master '''and''' the tags upstream | ||
##: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'' | ||
##:for the tags (all repos): ''git push origin version/ | ##:for the tags (all repos): ''git push origin version/3.0.0'' | ||
# '''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 | ||
<!-- We don't really need this step... | <!-- We don't really need this step... | ||
| Line 42: | Line 42: | ||
##Pull current Git, create the release branches (for sg/fg/fgdata): | ##Pull current Git, create the release branches (for sg/fg/fgdata): | ||
##:''git pull | ##:''git pull | ||
##:''git branch release/ | ##:''git branch release/3.0.0 | ||
##On the next/master branches, bump up the version-number of simgear, flightgear and fgdata to an odd number ( | ##On the next/master branches, bump up the version-number of simgear, flightgear and fgdata to an odd number (3.0.0 -> 3.1.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.9.0" | ##Tag (annotated) flightgear, simgear and fgdata with "version/2.9.0" | ||
##:''git tag -a version/2.9.0'' (Enter a wise comment) | ##:''git tag -a version/2.9.0'' (Enter a wise comment) | ||
##Push the branches next/master '''and''' release/ | ##Push the branches next/master '''and''' release/3.0.0 '''and''' the tags upstream | ||
##:for flightgear, simgear and fgdata: ''git push origin release/ | ##:for flightgear, simgear and fgdata: ''git push origin release/3.0.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'' | ||
##:for the tags (all repos): ''git push origin version/ | ##:for the tags (all repos): ''git push origin version/3.1.0'' | ||
##Declare dev-streams "open" or "green" | ##Declare dev-streams "open" or "green" | ||
##: Ask a wiki admin to change the content of wiki template at [[Template:GitStatus]] to <code><nowiki>{{GitStatus:open}}</nowiki></code> | ##: Ask a wiki admin to change the content of wiki template at [[Template:GitStatus]] to <code><nowiki>{{GitStatus:open}}</nowiki></code> | ||
| Line 60: | Line 60: | ||
# '''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/ | ##Tag the release/3.00 branches of simgear, flightgear and fgdata and push the tags. | ||
##:for flighgear, simgear and fgdata: ''git tag version/ | ##:for flighgear, simgear and fgdata: ''git tag version/3.0.0-final'' | ||
##:for flighgear, simgear and fgdata: ''git push origin version/ | ##:for flighgear, simgear and fgdata: ''git push origin version/3.0.0-final'' | ||
##Merge the branch release/ | ##Merge the branch release/3.0.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/ | ##:''git merge version/3.0.0-final | ||
##:''git push origin master'' | ##:''git push origin master'' | ||