Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document version auto-increment and fix typos. #1039

Merged
merged 2 commits into from
Jun 24, 2024

Conversation

dblock
Copy link
Member

@dblock dblock commented Jun 20, 2024

Description

Document version auto-increment and fix typos.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

reta
reta previously approved these changes Jun 20, 2024
@dblock
Copy link
Member Author

dblock commented Jun 20, 2024

@reta @Xtansia I think I am getting confused to what's supposed to happen in which order for the release.

  1. If I am releasing a 2.10.5, which branch is that supposed to happen on?
  2. If I am releasing a 2.11.0, which branch is that supposed to happen on?
  3. How do the instruction change for CHANGELOG, where do you make the changes first?

@reta
Copy link
Collaborator

reta commented Jun 20, 2024

@reta @Xtansia I think I am getting confused to what's supposed to happen in which order for the release.

I think the branch versioning was a bit messed up:

  • main should be 3.0.0 (that part is fine)
  • 2.x should have technically be 2.10.5-SNAPSHOT (but it was 2.11.0)

So the sequence we follow for releases is:

  • branch of next release out of 2.x (for example 2.11.0)
  • update CHANGELOG in 2.11.0 (we need the commit for release)
  • push release tag (v2.11.0)
  • forwardport to 2.x and main

@dblock
Copy link
Member Author

dblock commented Jun 20, 2024

Ok, @reta take a look at the updated instructions, does this capture this process?

reta
reta previously approved these changes Jun 20, 2024
@reta
Copy link
Collaborator

reta commented Jun 20, 2024

Ok, @reta take a look at the updated instructions, does this capture this process?

It does (in my opinion), thanks @dblock !

@Xtansia
Copy link
Collaborator

Xtansia commented Jun 20, 2024

I don't know about the Java client, it looks like it's been doing branches per patch version off of 2.x. Normally for OpenSearch and at least the Rust & .NET clients, the branching is (assuming 2.10.4 is latest released):

  • main: next major i.e. 3.0.0-SNAPSHOT
  • 2.x: next minor i.e. 2.11.0-SNAPSHOT
  • 2.10: next patch i.e. 2.10.5-SNAPSHOT

Then releasing a new patch is:

  1. Commit changelog to 2.10
  2. Tag v2.10.5 on 2.10
  3. Auto build & release v2.10.5
  4. Auto-increments 2.10 to developing 2.10.6-SNAPSHOT

Releasing a new minor:

  1. Commit changelog to 2.x
  2. Tag v2.11.0 on 2.x
  3. Auto build & release v2.11.0
  4. Auto-increment 2.x to developing 2.12.0-SNAPSHOT
  5. Auto-branch and increment 2.11 to developing 2.11.1-SNAPSHOT

Releasing a new major:

  1. Commit changelog to main
  2. Tag v3.0.0 on main
  3. Auto build & release v3.0.0
  4. Auto-increment main to developing 4.0.0-SNAPSHOT
  5. Auto-branch and increment 3.x to developing 3.1.0-SNAPSHOT
  6. Auto-branch and increment 3.0 to developing 3.0.1-SNAPSHOT

.NETs Bump Version Workflow: https://github.com/opensearch-project/opensearch-net/blob/main/.github/workflows/bump-version.yml

@dblock
Copy link
Member Author

dblock commented Jun 20, 2024

@Xtansia I think yours is clearer, take a look at the update please?

Copy link
Collaborator

@Xtansia Xtansia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All looks good to me, just a couple minor things to fix

RELEASING.md Outdated Show resolved Hide resolved
RELEASING.md Outdated Show resolved Hide resolved
@dblock dblock requested a review from Xtansia June 21, 2024 11:59
@dblock dblock requested a review from reta June 24, 2024 13:48
@dblock dblock merged commit 3af2d77 into opensearch-project:main Jun 24, 2024
56 checks passed
@dblock dblock deleted the releasing-misc branch June 25, 2024 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants