Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

releasesAndContributions

Meine Toonen edited this page Mar 28, 2017 · 11 revisions

Contributions

We gladly accept contributions. The procedure for this is to make a branch in which you make your changes. In the case of a large change (lots of changes, architectural change, or a new feature), make a proposal. When the change is done, make a Pull Request, and - optionally - contact the mailinglist. All changes must be via separate branches, because we have a separate branch from which we release a stable version. The master branch is protected, so no changes can be automatically be pushed unto master and we have to manually cherry-pick each commit. Each Pull Request must pass the automatic build tests and must be reviewed by a committer, before it can be merged unto master (and later the stable branches).

Branches

There are 2 main branches:

  1. master: this is not guaranteed to be stable, but has the most up-to-date features
  2. stable: this is guaranteed to be stable, but it's not cutting edge

Feature- and bugfixbranches must not be removed after merging into master. Only after being merged into stable, a feature- of bugfixbranche can be removed.

Release

Two times per year, B3Partners will release a stable version of flamingo. This release will be thoroughly tested, and only after all tests pass, it will be released. The master/development version - which until now was released almost montly - will be released upon request, or when a developer will feel like it.

The procedure for a stable release is:

  1. Determine features/bugs to be included in the release
  2. Featurefreeze at T - 14 days
  3. Testing of pre release from T - 14 to T - 10
  4. Bugfixes from T - 9 to T - 5
  5. Test the bugfixes from T - 4 to T -3
  6. Last bugfixing
  7. Release!

When blocking issues are found after a stable release, a bugfix release will be made.

Version numbers

..[.] MainVersion: Only increases with very large changes. Stable: Increases with every stable release Minor: Increases with every development/master release. Resets every stable release Bugfix: Only shown in stable release version. Increases when there is a bugfix release unto the stable release. Resets every new stable release.

Clone this wiki locally