Changes

Jump to navigation Jump to search
109 bytes added ,  23:10, 17 February 2014
Add FGRun in the release process
Line 15: Line 15:  
After branching, there is one month for bug fixing in the release branch, so building and packing of the binaries and FGDATA takes place around February, 18th and August, 18th. Allowing a few days for distribution of the files, new versions should be publically available around the 20th of February and August.
 
After branching, there is one month for bug fixing in the release branch, so building and packing of the binaries and FGDATA takes place around February, 18th and August, 18th. Allowing a few days for distribution of the files, new versions should be publically available around the 20th of February and August.
   −
The development stream of SimGear, FlightGear and FGDATA is set into a frozen state one month before the branch-day (17th), to let the dust of development settle and to allow fixing the most annoying bugs in the code. During this period, developers should not add any new features, subsystems, and the like. Immediately after the stream has branched for the release, development in the main stream (next/master) is open for major changes until one month before the next branch-day. This results in a duty cycle of 5 month developing and 1 month thinking.
+
The development stream of SimGear, FlightGear, FGRun and FGDATA is set into a frozen state one month before the branch-day (17th), to let the dust of development settle and to allow fixing the most annoying bugs in the code. During this period, developers should not add any new features, subsystems, and the like. Immediately after the stream has branched for the release, development in the main stream (next/master) is open for major changes until one month before the next branch-day. This results in a duty cycle of 5 month developing and 1 month thinking.
    
== Version numbers ==
 
== Version numbers ==
Line 32: Line 32:  
##Create a "release preperations" topic at the forum and make it a "Global Announcement", add a call for screenshots
 
##Create a "release preperations" topic at the forum and make it a "Global Announcement", add a call for screenshots
 
##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.9.0 -> 3.0.0)
+
##Bump up the version-number of simgear/next, flightgear/next, fgrun/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+fgrun) and master(fgdata)
##Tag (annotated) flightgear, simgear and fgdata with <tt>version/3.0.0</tt>
+
##Tag (annotated) flightgear, simgear, fgrun and fgdata with <tt>version/3.0.0</tt>
 
##:<code>git tag -a version/3.0.0</code> (Enter a wise comment)
 
##:<code>git tag -a version/3.0.0</code> (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: <code>git push origin next</code>
+
##:for flightgear, fgrun and simgear: <code>git push origin next</code>
 
##:for fgdata: <code>git push origin master<code>
 
##:for fgdata: <code>git push origin master<code>
 
##:for the tags (all repos): <code>git push origin version/3.0.0</code>
 
##:for the tags (all repos): <code>git push origin version/3.0.0</code>
Line 48: Line 48:  
##: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>
 
-->
 
-->
##Pull current Git, create the release branches (for sg/fg/fgdata):
+
##Pull current Git, create the release branches (for sg/fg/fgrun/fgdata):
 
##:<code>git pull</code>
 
##:<code>git pull</code>
 
##:<code>git branch release/3.0.0</code>
 
##:<code>git branch release/3.0.0</code>
##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)
+
##On the next/master branches, bump up the version-number of simgear, flightgear, fgrun 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, fgrun and fgdata with "version/2.9.0"
 
##:<code>git tag -a version/2.9.0</code> (Enter a wise comment)
 
##:<code>git tag -a version/2.9.0</code> (Enter a wise comment)
 
##Push the branches next/master '''and''' release/3.0.0 '''and''' the tags upstream
 
##Push the branches next/master '''and''' release/3.0.0 '''and''' the tags upstream
##:for flightgear, simgear and fgdata: <code>git push origin release/3.0.0</code>
+
##:for flightgear, simgear, fgrun and fgdata: <code>git push origin release/3.0.0</code>
##:for flightgear and simgear: <code>git push origin next</code>
+
##:for flightgear, fgrun and simgear: <code>git push origin next</code>
 
##:for fgdata: <code>git push origin master</code>
 
##:for fgdata: <code>git push origin master</code>
 
##:for the tags (all repos): <code>git push origin version/3.1.0</code>
 
##:for the tags (all repos): <code>git push origin version/3.1.0</code>
Line 68: Line 68:  
# '''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/3.00 branches of simgear, flightgear and fgdata and push the tags.
+
##Tag the release/3.0.0 branches of simgear, flightgear, fgrun and fgdata and push the tags.
##:for flighgear, simgear and fgdata: <code>git tag version/3.0.0-final</code>
+
##:for flighgear, simgear, fgrun and fgdata: <code>git tag version/3.0.0-final</code>
##:for flighgear, simgear and fgdata: <code>git push origin version/3.0.0-final</code>
+
##:for flighgear, simgear, fgrun and fgdata: <code>git push origin version/3.0.0-final</code>
 
##Merge the branch release/3.0.0 into '''master''' (<u>'''NOT'''</u> next) for flightgear and simgear and push the branch
 
##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, fgrun and simgear:  
 
##:<code>git checkout -b master origin/master</code> or <code>git checkout master</code> if you already have the local branch
 
##:<code>git checkout -b master origin/master</code> or <code>git checkout master</code> if you already have the local branch
 
##:<code>git merge version/3.0.0-final</code>
 
##:<code>git merge version/3.0.0-final</code>
Line 107: Line 107:  
! [[File:Traffic light red.png|20px]]
 
! [[File:Traffic light red.png|20px]]
 
! Closed/Red
 
! Closed/Red
| Nothing shall be pushed to the development streams (simgear, flightgear and fgdata). This state is for creating the release branches. It lasts for just a few hours on Jan 17th and Jul 17th around 12:00 UTC.
+
| Nothing shall be pushed to the development streams (simgear, flightgear, fgrun and fgdata). This state is for creating the release branches. It lasts for just a few hours on Jan 17th and Jul 17th around 12:00 UTC.
 
|}
 
|}
  
577

edits

Navigation menu