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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃殌 Release 0.43.1 #5333

Closed
wants to merge 1 commit into from
Closed

馃殌 Release 0.43.1 #5333

wants to merge 1 commit into from

Conversation

Copy link

codecov bot commented Dec 13, 2023

Codecov Report

Merging #5333 (5e7a0c0) into release/0.43 (124840e) will not change coverage.
The diff coverage is 100.00%.

Additional details and impacted files
@@              Coverage Diff              @@
##           release/0.43    #5333   +/-   ##
=============================================
  Coverage         96.20%   96.20%           
=============================================
  Files               134      134           
  Lines             22712    22712           
=============================================
  Hits              21849    21849           
  Misses              863      863           

Copy link
Contributor

@github-actions github-actions bot temporarily deployed to pull request December 13, 2023 06:16 Inactive
@banesullivan
Copy link
Member

@tkoyama010, this actually isn't how we want to perform patch releases and this PR alone is not sufficient. The process for patches is different from minor releases in that we have to merge or cherry-pick commits onto the release branch. This can vary depending on the patches being applied. For this patch release, what we want to do is make sure all of the above PRs are merged to main, then git merge main from the release/0.43 branch and ensure the version string is set accordingly after (to version 0.43.1). The general philosophy is well outlined here in the trunk based development guide.

Since we are so close to the date of the release and we aren't considering the above to be significant features worthy of a minor release, a git merge main is appropriate here. As we move forward, the approach will be to git cherry-pick individual commits onto the release/0.43 branch.

Further, we do not want to create these patch release/ branches in the repository as the release/* pattern is protected and this non-functional branch (release/0.43.1) breaks that model.

I'm going to recreate a PR for this after #4938 merges to show the general process in this specific scenario (noting that cherry-pick will be a different process)

@banesullivan
Copy link
Member

To outline, my process for this scenario will be:

  1. git checkout release/0.43
  2. git checkout -b patch/0.43.1
  3. git merge main
  4. Address merge conflicts (the version string most likely)
  5. Bump the version to 0.43.1
  6. Make sure changes are committed
  7. git push --set-upstream origin patch/0.43.1
  8. Open a pull request for patch/0.43.1 targeting release/0.43
  9. Merge pull request
  10. Tag the latest commit on the release/0.43 branch

This is more involved and hence why in the past, Alex and I have just manually done this directly on the release/0.xx branch without a PR. (a ~2 step process)

@tkoyama010
Copy link
Member Author

tkoyama010 commented Dec 14, 2023

@banesullivan Thanks for sharing your knowledge. Your procedure is better than mine. I will start over again.

@banesullivan
Copy link
Member

To clarify: I'll handle this patch release to make sure all goes smoothly

@tkoyama010
Copy link
Member Author

To clarify: I'll handle this patch release to make sure all goes smoothly

Yes, please. I'm sorry. I wrote the wrong sentence.

@tkoyama010 tkoyama010 closed this Dec 14, 2023
@banesullivan
Copy link
Member

banesullivan commented Dec 14, 2023

I want to add some additional context though: most libraries that follow this release-branching model (VTK is also one) do not typically issue a PR for approval for patch releases. Typically the process is to continually approve and land PRs onto main and noting in that PR whether or not it should be backported to the release branch. Then a single person git cherry-picks those commits onto the release branch and tags the release when deemed appropriate

@banesullivan
Copy link
Member

I'll do a PR approach this time though to provide more transparency into the process.

And I know it may feel nitpicky that I'm raising so much concern over the branch name for this starting with release/, but it is critically important in our branching model and will leave us with a very hard to maintain branching structure for our releases

@banesullivan banesullivan deleted the release/0.43.1 branch December 14, 2023 03:07
@tkoyama010
Copy link
Member Author

I'll do a PR approach this time though to provide more transparency into the process.

And I know it may feel nitpicky that I'm raising so much concern over the branch name for this starting with release/, but it is critically important in our branching model and will leave us with a very hard to maintain branching structure for our releases

OK. I will try to watch what you do and learn the steps.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants