Skip to content

Commit 145a790

Browse files
authored
Updates the RELEASING.md documentation to match what we are currently doing. (opensearch-project#264)
Signed-off-by: David Venable <dlv@amazon.com>
1 parent 087d252 commit 145a790

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

RELEASING.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,25 @@ This document explains the release strategy for artifacts in this organization.
1313

1414
### Release Branching
1515

16-
Given the current major release of 1.0, projects in this organization maintain the following active branches.
17-
18-
* **main**: The next _major_ release. This is the branch where all merges take place and code moves fast.
19-
* **1.x**: The next _minor_ release. Once a change is merged into `main`, decide whether to backport it to `1.x`.
20-
* **1.0**: The _current_ release. In between minor releases, only hotfixes (e.g. security) are backported to `1.0`.
21-
22-
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.
16+
This project currently releases only from `main`.
2317

2418
### Feature Branches
2519

2620
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.
2721

2822
## Release Labels
2923

30-
Repositories create consistent release labels, such as `v1.0.0`, `v1.1.0` and `v2.0.0`, as well as `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.
24+
Repositories create consistent release labels, such as `1.0.0`, `1.1.0` and `2.0.0`, as well as `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.
3125

3226
## Releasing
3327

3428
The release process is standard across repositories in this org and is run by a release manager volunteering from amongst [MAINTAINERS](MAINTAINERS.md).
3529

36-
1. Create a tag, e.g. 1.0.0, and push it to this GitHub repository.
30+
1. Create a tag, e.g. `1.0.0`, and push it to this GitHub repository. You can do this from your local fork:
31+
1. `git fetch upstream --tags`
32+
1. `git tag 2.0.3`
33+
1. `git push --tags upstream`
3734
1. The [release-drafter.yml](.github/workflows/release-drafter.yml) will be automatically kicked off and a draft release will be created.
38-
1. This draft release triggers the [jenkins release workflow](https://build.ci.opensearch.org/job/logstash-ouput-opensearch-release) as a As a result of which the logstash-output-plugin is released on [rubygems.org](https://rubygems.org/gems/logstash-output-opensearch). Please note that the release workflow is triggered only if created release is in draft state.
35+
1. This draft release triggers the [jenkins release workflow](https://build.ci.opensearch.org/job/logstash-output-opensearch-release) as a As a result of which the logstash-output-plugin is released on [rubygems.org](https://rubygems.org/gems/logstash-output-opensearch). Please note that the release workflow is triggered only if created release is in draft state.
3936
1. Once the above release workflow is successful, the drafted release on GitHub is published automatically.
4037
1. Increment "version" in [logstash-output-opensearch.gemspec](./logstash-output-opensearch.gemspec) to the next iteration, e.g. 1.0.1.

0 commit comments

Comments
 (0)