Release 1.3.2 #1696
Merged
Release 1.3.2 #1696
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
mflendrich
approved these changes
Aug 12, 2021
There was a problem hiding this comment.
The code change LGTM.
We don't yet have a procedure for updating content in main when changes occur in other branches but only main matters
A way of solving this that's most natural to me is:
- fixing the bug in
main - backporting the bugfix into old release branches
That would be the other way around than we did in this PR, but that's nothing wrong - at most, unorthodox for the "canonical" master development or gitflow models. I don't understand the only main matters part of the comment, though.
Organizing the commits so that they should be cherrypickable sounds great. Could you please ensure that the fix gets ported to main? Either by opening a PR, or at least an issue in the 2.0 GA blocker milestone. Thanks.
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.
What this PR does / why we need it:
Releases 1.3.2. Primary motivator was #1691. We need to run through a backport (sorta--2.0.0 isn't actually out yet) release. Also bumps to Kong 2.5 because may as well.
Special notes for your reviewer:
We have not previously done any releases from version branches. This may not work. We need to confirm CI results and address any issues after pushing the tag.
We don't yet have a procedure for updating content in main when changes occur in other branches but only main matters. Here, the changelog and single manifests need to be in main. I've set up the commits so that cherry-picking should be an option after. Changes to the internals (the manifest sources and Makefile) can be left on this branch alone.