Hi fellow wiki editors!

To help newly registered users get more familiar with the wiki (and maybe older users too) there is now a {{Welcome to the wiki}} template. Have a look at it and feel free to add it to new users discussion pages (and perhaps your own).

I have tried to keep the template short, but meaningful. /Johan G

Difference between revisions of "Release plan"

From FlightGear wiki
Jump to: navigation, search
(Version numbers: Finish section)
(Comment out a lot of stuff)
Line 56: Line 56:
  
 
[[File:ReleasePlan.jpg|thumb|250px|The original release plan.]]
 
[[File:ReleasePlan.jpg|thumb|250px|The original release plan.]]
FlightGear has had two release plans over [[FlightGear History|history]]. The original release plan was developed by Mathias Fröhlich, Martin Spott, Thorsten Brehm and Torsten Dreyer during LinuxTag 2011.
+
FlightGear has had two release plans over [[FlightGear History|history]]. The original release plan was developed by Mathias Fröhlich, Martin Spott, Thorsten Brehm and Torsten Dreyer during LinuxTag 2011. The current plan was proposed by Torsten Dreyer after the 3.6 release was [[FlightGear Newsletter November 2015#FlightGear v3.6 canceled|cancelled]].
  
 
To suggest improvements and/or changes to the release plan, it is recommended to get in touch via the [[mailing list]]. Improvements can be based on the [[Release plan/Lessons learned|lessons learned]] from previous releases.
 
To suggest improvements and/or changes to the release plan, it is recommended to get in touch via the [[mailing list]]. Improvements can be based on the [[Release plan/Lessons learned|lessons learned]] from previous releases.
Line 96: Line 96:
 
{{note|In general, release are referred to by their first two digits (e.g., 3.4). However, when filing a bug report or debugging problems, it is a good idea to give the full release number.}}
 
{{note|In general, release are referred to by their first two digits (e.g., 3.4). However, when filing a bug report or debugging problems, it is a good idea to give the full release number.}}
  
 +
<!--
 
== Detailed time schedule and checklist ==
 
== Detailed time schedule and checklist ==
 
# '''Dec/Jun 17th:''' Development stream is declared "frozen" or "yellow"
 
# '''Dec/Jun 17th:''' Development stream is declared "frozen" or "yellow"
Line 112: Line 113:
 
##: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>
 
# '''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... --
 
##Declare the streams "closed" or "red"
 
##Declare the streams "closed" or "red"
 
##:Send a mail to the flightgear-devel mail-list, asking not to commit/push anything
 
##:Send a mail to the flightgear-devel mail-list, asking not to commit/push anything
 
##: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>
-->
+
 
 +
 
 
##Pull current Git, create the release branches (for sg/fg/fgrun/fgdata):
 
##Pull current Git, create the release branches (for sg/fg/fgrun/fgdata):
 
##:<code>git pull</code>
 
##:<code>git pull</code>
Line 155: Line 159:
 
##:<code>git push origin master</code>
 
##:<code>git push origin master</code>
 
##[[:Category:FlightGear Core developers|Core developers]] and other contributors should be invited to add their release related experiences (i.e. suggestions for improvements) to the wiki to help update and improve the release plan (i.e. this page) accordingly.
 
##[[:Category:FlightGear Core developers|Core developers]] and other contributors should be invited to add their release related experiences (i.e. suggestions for improvements) to the wiki to help update and improve the release plan (i.e. this page) accordingly.
 +
-->
 +
== Version files ==
 +
; FGData: {{fgdata file|version}}
 +
; SimGear: {{simgear file|version}}
 +
; FlightGear: {{flightgear file|version}}
  
== To bump up the version number ==
+
<!--
* fgdata
+
** edit the {{fgdata file|version|t=version}} file
+
* SimGear
+
** edit the {{simgear file|version|t=version}} file
+
* FlightGear
+
** edit the {{flightgear file|version|t=version}} file
+
* FGRun
+
** edit the [http://sourceforge.net/p/flightgear/fgrun/ci/next/tree/version version] file
+
 
+
 
== Definition of repository states ==
 
== Definition of repository states ==
 
{| class="wikitable"
 
{| class="wikitable"
Line 194: Line 194:
 
'''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.
 
'''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://sourceforge.net/p/flightgear/codetickets/ 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://sourceforge.net/p/flightgear/codetickets/ bugtracker] is the primary source of bug reports. Unlike the forum or mailing list, bugs reported there will be tracked, making it easier for developers to. When reporting bugs, it is best to provide as muh information as possible to more easily find the bug.
 
+
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.12.0 the list of fixed bugs].
+
  
 +
<!--
 
=== Tasks and owners ===
 
=== Tasks and owners ===
  
Line 267: Line 267:
 
== Open items, questions ==
 
== Open items, questions ==
 
* Automate and/or document the creation of RC's: "We need to get this automated some day. Or at least documented...(another one from "famous last words": if you have to do it more than once, automate it. If you can't automate it, document it."<ref>{{Cite web |url=http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg39205.html |title=<nowiki>Re: [Flightgear-devel] Release candidates</nowiki> |author=Torsten Dreyer |date=29 January 2013}}</ref>
 
* Automate and/or document the creation of RC's: "We need to get this automated some day. Or at least documented...(another one from "famous last words": if you have to do it more than once, automate it. If you can't automate it, document it."<ref>{{Cite web |url=http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg39205.html |title=<nowiki>Re: [Flightgear-devel] Release candidates</nowiki> |author=Torsten Dreyer |date=29 January 2013}}</ref>
* <del>Automate the creation of Windows and Mac installers</del>  {{Done}} <ref>http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg40650.html</ref> (see [[FlightGear Build Server]])
 
 
* Automate the creation of fgdata distribution
 
* Automate the creation of fgdata distribution
 
* Possibly try to find a way to automate testing of updated jsbsim code, so that the chance for breakage is reduced by running scripted tests <ref>{{Cite web |url=http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg39109.html |title=<nowiki>Re: [Flightgear-devel] [Jsbsim-devel] JSBSim Synch with FlightGear</nowiki> |author=Torsten Dreyer |date=13 January 2013}}</ref><ref>{{Cite web |url=http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg40201.html |title=<nowiki>Re: [Flightgear-devel] JSBSim Synch with FlightGear</nowiki> |author=Anders Gidenstam |date=11 June 2013}}</ref><ref>
 
* Possibly try to find a way to automate testing of updated jsbsim code, so that the chance for breakage is reduced by running scripted tests <ref>{{Cite web |url=http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg39109.html |title=<nowiki>Re: [Flightgear-devel] [Jsbsim-devel] JSBSim Synch with FlightGear</nowiki> |author=Torsten Dreyer |date=13 January 2013}}</ref><ref>{{Cite web |url=http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg40201.html |title=<nowiki>Re: [Flightgear-devel] JSBSim Synch with FlightGear</nowiki> |author=Anders Gidenstam |date=11 June 2013}}</ref><ref>
Line 274: Line 273:
 
</ref>
 
</ref>
  
 +
-->
 
== Lessons learned ==
 
== Lessons learned ==
 
See [[Release plan/Lessons learned]] for a list of things that turned out well and should be kept for the next release as well as thing that didn't turn out so well and should be changed for future releases. Ideally, the release plan should be updated and augmented so that the lessons learned are incorporated accordingly.  
 
See [[Release plan/Lessons learned]] for a list of things that turned out well and should be kept for the next release as well as thing that didn't turn out so well and should be changed for future releases. Ideally, the release plan should be updated and augmented so that the lessons learned are incorporated accordingly.  
  
{{Appendix}}
+
<!-- {{Appendix}} -->
  
 
[[Category:Core developer documentation]]
 
[[Category:Core developer documentation]]
 
[[Category:FlightGear]]
 
[[Category:FlightGear]]

Revision as of 13:25, 7 January 2016

Note  As of December 2015, the release plan is in the process of being changed so that the description below will no longer be accurate:
Cquote1.png Hi Everybody,

Today, December 17th would be the day to announce the feature freeze for 3.8 if we were following the usual release schedule.

A while ago I proposed a change in that schedule and I have spent some time on preparing the scripts for an automated release process since then. I think I have pretty much everything ready to go for automated releases and now I'd like to give it a first try for the 3.8 release next year.

For the first execution, I'd like to trigger the scripts manually on my local machine instead of Jenkins to have some better control of it. If it works out as expected, I'll put this onto our Jenkins server afterwards to be executed automatically for the release following after 3.8.

For now, I propose the following and would do so if nobody objects:

  • There is no feature freeze for the next (3.8) and the following releases
  • On Jan., 17th I trigger my first script to create release/3.8 branches with version 3.8.1 (!)
  • Immediately after that I let Jenkins create the binaries for 3.8.1 and we have our first release
  • Patches going into the release/3.8 branch automatically trigger a new build with a previous increase of the micro version number (3.8.2, 3.8.3,..) and we immediately have a bugfix release
  • On 'next', version numbers go to 3.9.0
  • Nightly builds are created from next after every push in that branch

After a to-be-defined period (my proposal: 3 month) we start over:

  • Create a release/3.9 branch with version 3.9.1
  • etc. etc.

Note: there will be no odd-even version number scheme (odd equals unstable, even equals stable). Instead, x.x.0 is unstable, nightly from next and x.x.n where n >= 1 is a stable release.

If everything works as expected, we have a major release every to-be-defined months, a bugfix release after every push to the release branch and a nightly build after every push to 'next'.

I hope this sounds reasonable and keeps everybody happy.

Feedback welcome.

Torsten
— Torsten Dreyer (Dec 17th, 2015). [Flightgear-devel] Relesae 3.8.
(powered by Instant-Cquotes)
Cquote2.png
Current release: 2018.3 (9 Dec 2018)
Next release: 2019.1 (a few days from now)
See release plan for details.

The release plan is the process by which a new version of FlightGear is released. The release plan is actually a continual work-in-progress, and is refined with every new release.

The original release plan.

FlightGear has had two release plans over history. The original release plan was developed by Mathias Fröhlich, Martin Spott, Thorsten Brehm and Torsten Dreyer during LinuxTag 2011. The current plan was proposed by Torsten Dreyer after the 3.6 release was cancelled.

To suggest improvements and/or changes to the release plan, it is recommended to get in touch via the mailing list. Improvements can be based on the lessons learned from previous releases.

General release concept (old release plan)

New FlightGear releases are scheduled twice a year. The magic number to remember is 17. On the 17th of January (the first month) and July (the seventh month), a new release branch is created for SimGear, the FlightGear source, and fgdata.

Cquote1.png As a clarification: We do not enter a code freeze but a feature freeze. Code changes are welcome after December 17th as long as it is guaranteed (not just "unlikely") that they do not introduce any side effects and become a release blocker. It is the sole responsibility of the committer to decide if that is the case or not. Every new feature that didn't make it into the repository by the deadline may probably easily wait for another four weeks to get committed. Remember: most aircraft are not affected by the feature freeze and aircraft developers quickly adopt and use new features as they become available
— Torsten Dreyer (16th Nov 2012). [Flightgear-devel] Next FlightGear release (Feb. 17 2013).
Cquote2.png

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 the 18th of February and the 18th of August. Allowing a few days for distribution of the files, new versions should be publicly 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.

Version numbers

FlightGear version numbers consist of three digits, separated by dots:

Before 2016.1

  • Major (3.4.0): Only increased after significant changes to the functionality of the software (e.g., 1.x.x → 2.0.0 (due to switch to OSG).
  • Minor (3.4.0): Has two applications:
    • Stable releases always have even numbers (e.g. 2.8.0, 2.10.0, 2.12.0).
    • The latest Git version or nightly build uses an odd number, always one more than the latest stable release's minor revision numbere. For example, when the latest release was 3.4.0, the current development stream was 3.5.0.
  • Revision (3.4.0): Increased by bugfix releases (e.g., 2.12.1).

2016.1 and after

  • Year (2016.1.0): The year the version was released.
  • Number (2016.1.0): Which release of the year the version is (note: starts at 1).
  • Revision (2016.1.0): Indicates one of two things:
    • In the latest Git version or nightly build, this digit is 0, indicating that it is unstable.
    • When a new release is created, this digit is set to 1. With bugfix that is made, this digit is increased by 1, and a new version created.
Note  In general, release are referred to by their first two digits (e.g., 3.4). However, when filing a bug report or debugging problems, it is a good idea to give the full release number.

Version files

FGData
fgdata/version
SimGear
simgear/version
FlightGear
flightgear/version

Bug tracking

The bugtracker is the primary source of bug reports. Unlike the forum or mailing list, bugs reported there will be tracked, making it easier for developers to. When reporting bugs, it is best to provide as muh information as possible to more easily find the bug.

Lessons learned

See Release plan/Lessons learned for a list of things that turned out well and should be kept for the next release as well as thing that didn't turn out so well and should be changed for future releases. Ideally, the release plan should be updated and augmented so that the lessons learned are incorporated accordingly.