Daniel (dB.) Doubrovkine
cec268e48d
* Prepare for next developer iteration, 2.4.1. Signed-off-by: dblock <dblock@amazon.com> * Fix: sync opensearchpy without iohttp. Signed-off-by: dblock <dblock@amazon.com> * Use nox to run tests. Signed-off-by: dblock <dblock@amazon.com> --------- Signed-off-by: dblock <dblock@amazon.com>
40 lines
2.5 KiB
Markdown
40 lines
2.5 KiB
Markdown
- [Overview](#overview)
|
|
- [Branching](#branching)
|
|
- [Release Branching](#release-branching)
|
|
- [Feature Branches](#feature-branches)
|
|
- [Release Labels](#release-labels)
|
|
- [Releasing](#releasing)
|
|
|
|
## Overview
|
|
|
|
This document explains the release strategy for artifacts in this organization.
|
|
|
|
## Branching
|
|
|
|
### Release Branching
|
|
|
|
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 to `1.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.
|
|
|
|
### Feature Branches
|
|
|
|
Do not creating 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.
|
|
|
|
## Release Labels
|
|
|
|
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. See [MAINTAINERS](MAINTAINERS.md#triage-open-issues) for more information on triaging issues.
|
|
|
|
## Releasing
|
|
|
|
The release process is standard across repositories in this org and is run by a release manager volunteering from amongst [maintainers](MAINTAINERS.md).
|
|
|
|
1. Create a tag, e.g. v2.1.0, and push it to the GitHub repo.
|
|
1. The [release-drafter.yml](.github/workflows/release-drafter.yml) will be automatically kicked off and a draft release will be created.
|
|
1. This draft release triggers the [jenkins release workflow](https://build.ci.opensearch.org/job/opensearch-py-release/) as a result of which opensearch-py client is released on [PyPi](https://pypi.org/project/opensearch-py/).
|
|
1. Once the above release workflow is successful, the drafted release on GitHub is published automatically.
|
|
1. Add an "Unreleased" section to CHANGELOG, and increment version to the next patch release, e.g. v2.1.1. See [example](https://github.com/opensearch-project/opensearch-py/pull/593). |