Skip to content

Project Branches Workflow and Tagging

joergboe edited this page Aug 7, 2018 · 5 revisions

Current Branches

  • master - This is the main development stream and contains operators and functions which are available on all supported platforms. A subset of this operators is shipped with the Streams product.
  • v2.9.x_m - release/maitenance branch for release 2.9.x and the targeted Streams product releases
  • V2.2.0_m - release/maitenance for Streams version > 4.2.1
  • V2.1.y - release/maitenance for Streams 4.2.1 - globalization work and actual code base from master branch
  • v2.0.0 - release/maitenance for FP for Streams 4.0.0, 4.0.1, 4.1 and 4.2
  • streams_3.2.1 - targeted for Streams 3.2.1.x
  • Streams_2.0 - targeted for Streams 2.0
  • HTTPRequestAsync - contains a new operator which is designed to work well with HTTP(S) (REST) services in asynchronous manner. It should be considered pre-release and is supported only on intel rhel7 platform.
  • gh-pages - contains the toolkit documentation.

Workflow

Use feature development branches and bugfix branches to develop new features or bug fixes. ( dev_xxx, feature_xxx or fix_xxx ) The recommended workflow is Git Feature Branch Workflow. When ready, submit a pull request against the target branch (master).

Please ensure that the branch is deleted once merged.

Users with no write access to this repository must use the Forking Workflow

Toolkit versions and version tagging

oolkit releases should follow to General Toolkit Version Guidelines Use an annotated git tag to flag a specific toolkit release. Tag names should have the form: v.X.Y.Z Create no maintenance/release branch if it is not absolutely necessary.