This document explains the release strategy for artifacts in this organization.
Given the current major release of 1.0, projects in this organization maintain the following active branches.
- main: The next major release. This is the branch where all merges take place and code moves fast.
- 1.x: The next minor release. Once a change is merged into
main
, decide whether to backport it to1.x
. - 1.0: The current release. In between minor releases, only hotfixes (e.g. security) are backported to
1.0
.
Label PRs with the next major version label (e.g. 2.0.0
) and merge changes into main
. Label PRs that you believe need to be backported as 1.x
and 1.0
. Backport PRs by checking out the versioned branch, cherry-pick changes and open a PR against each target backport branch.
Do not create branches in the upstream repo, use your fork, for the exception of long lasting feature branches that require active collaboration from multiple developers. Name feature branches feature/<thing>
. Once the work is merged to main
, please make sure to delete the feature branch.
Repositories create consistent release labels, such as v1.0.0
, v1.1.0
and v2.0.0
, as well as patch
and backport
. Use release labels to target an issue or a PR for a given release.
The release process is standard across repositories in this org and is run by a release manager volunteering from amongst maintainers.
- Create a tag, e.g. v2.1.0, and push it to the GitHub repo.
- The release-drafter.yml will be automatically kicked off and a draft release will be created.
- This draft release triggers the jenkins release workflow as a result of which OUI is released on npmjs.
- Once the above release workflow is successful, the drafted release on GitHub is published automatically.
- Increment "version" in package.json to the next patch release, e.g. v2.1.1. See example