chore: prepare release for 1.40.2 #3019
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Mark Phelps <[email protected]>
Signed-off-by: Mark Phelps <[email protected]>
|
bare with me, I resolve the conflicts, but that merged in main. This is not what we want, it has all the other updates in main. |
…ed (#3018) Signed-off-by: George MacRorie <[email protected]>
Signed-off-by: George MacRorie <[email protected]>
Signed-off-by: George MacRorie <[email protected]>
markphelps
approved these changes
Apr 23, 2024
|
Closing this now and I will get a PR up for the changelog separately. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When I came to add this I found that the original
release/1.40branch was actually deleted after the last release.So in order to base it from that, I fetch the original head commit for that branch and based this PR on that.
As otherwise, I didn't have the
1.4xchangelog entries, because my localrelease/1.40was from before it was deleted.That is why the extra 1.40.1 commit re-appears in here. But the resulting changelog should be as expected.